[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 6540890978a9b8ac6b7875678b1484ed76389870
Evergreen Git
git at git.evergreen-ils.org
Fri Sep 16 10:22:21 EDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_2_1 has been updated
via 6540890978a9b8ac6b7875678b1484ed76389870 (commit)
via 765e66aa68239bdb1b6496325d8b56d900bee447 (commit)
from a89267692ad580a2fefa7150c3423843e3f7d4e5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6540890978a9b8ac6b7875678b1484ed76389870
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Sep 16 10:23:32 2011 -0400
lp 851915: remove last references to /openils/lib/perl5
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/examples/apache/eg.conf b/Open-ILS/examples/apache/eg.conf
index 8f21f72..e213819 100644
--- a/Open-ILS/examples/apache/eg.conf
+++ b/Open-ILS/examples/apache/eg.conf
@@ -14,7 +14,6 @@ ErrorLog /var/log/apache2/error.log
# ----------------------------------------------------------------------------------
# - needed by CGIs
-SetEnv PERL5LIB /openils/lib/perl5
PerlRequire /etc/apache2/startup.pl
PerlChildInitHandler OpenILS::WWW::Reporter::child_init
PerlChildInitHandler OpenILS::WWW::SuperCat::child_init
diff --git a/Open-ILS/tests/datasets/README b/Open-ILS/tests/datasets/README
index 1e13e4f..6eaa739 100644
--- a/Open-ILS/tests/datasets/README
+++ b/Open-ILS/tests/datasets/README
@@ -20,7 +20,7 @@ The following table lists the data sets we have collected for testing purposes.
=====How to load the test MFHD records=====
- First load the MARC21 records:
- - PERL5LIB=/openils/lib/perl5/ perl ../../src/extras/import/marc2bre.pl --marctype XML --start 1 --idfield 901 --idsubfield a serials_marc21.xml | perl ../../src/extras/import/pg_loader.pl -or bre -or mrd -or mfr -or mtfe -or mafe -or msfe -or mkfe -or msefe -a mrd -a mfr -a mtfe -a mafe -a msfe -a mkfe -a msefe | psql -U evergreen -h localhost
+ - perl ../../src/extras/import/marc2bre.pl --marctype XML --start 1 --idfield 901 --idsubfield a serials_marc21.xml | perl ../../src/extras/import/pg_loader.pl -or bre -or mrd -or mfr -or mtfe -or mafe -or msfe -or mkfe -or msefe -a mrd -a mfr -a mtfe -a mafe -a msfe -a mkfe -a msefe | psql -U evergreen -h localhost
- Then generate the metarecord map:
- pgsql -f ../../src/extras/import/quick_metarecord_map.sql
@@ -28,6 +28,6 @@ The following table lists the data sets we have collected for testing purposes.
- Then process and load the MFHD records - ingest is not used. Adjust the
contents of serials_lib.map to match your library-to-actor.org_unit.id
mappings:
- - PERL5LIB=/openils/lib/perl5/ perl ../../src/extras/import/marc2sre.pl --marctype XML --libmap serials_lib.map --password open-ils serials_mfhd.xml | perl ../../src/extras/import/pg_loader.pl -or sre > mfhd21.sql
+ - perl ../../src/extras/import/marc2sre.pl --marctype XML --libmap serials_lib.map --password open-ils serials_mfhd.xml | perl ../../src/extras/import/pg_loader.pl -or sre > mfhd21.sql
- psql -f mfhd21.sql
commit 765e66aa68239bdb1b6496325d8b56d900bee447
Author: Dan Scott <dscott at laurentian.ca>
Date: Fri Sep 16 09:59:54 2011 -0400
LP 851915: Remove references to /openils/lib/perl5
To prevent old versions of the OpenSRF and Evergreen Perl modules from
conflicting with the new versions of these modules (which are now
located in the default system Perl package directories), remove
references to them.
Also, O:W:AddedContent contains an old reference to a distro-specific
Perl directory that we can clean up at the same time.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/examples/apache/startup.pl b/Open-ILS/examples/apache/startup.pl
index f828447..6f1a742 100755
--- a/Open-ILS/examples/apache/startup.pl
+++ b/Open-ILS/examples/apache/startup.pl
@@ -1,5 +1,4 @@
#!/usr/bin/perl
-use lib qw( /openils/lib/perl5 );
use OpenILS::WWW::Exporter qw( /openils/conf/opensrf_core.xml );
use OpenILS::WWW::SuperCat qw( /openils/conf/opensrf_core.xml );
use OpenILS::WWW::AddedContent qw( /openils/conf/opensrf_core.xml );
diff --git a/Open-ILS/src/extras/import/direct_ingest.pl b/Open-ILS/src/extras/import/direct_ingest.pl
index 45df729..e25193e 100755
--- a/Open-ILS/src/extras/import/direct_ingest.pl
+++ b/Open-ILS/src/extras/import/direct_ingest.pl
@@ -2,8 +2,6 @@
use strict;
use warnings;
-use lib '/openils/lib/perl5/';
-
use OpenSRF::System;
use OpenSRF::EX qw/:try/;
use OpenSRF::AppSession;
diff --git a/Open-ILS/src/extras/import/direct_loader.pl b/Open-ILS/src/extras/import/direct_loader.pl
index 02c3f36..4a3dd0b 100755
--- a/Open-ILS/src/extras/import/direct_loader.pl
+++ b/Open-ILS/src/extras/import/direct_loader.pl
@@ -2,8 +2,6 @@
use strict;
use warnings;
-use lib '/openils/lib/perl5/';
-
use OpenSRF::System;
use OpenSRF::EX qw/:try/;
use OpenSRF::AppSession;
diff --git a/Open-ILS/src/extras/import/pg_loader.pl b/Open-ILS/src/extras/import/pg_loader.pl
index cde91de..f469d15 100755
--- a/Open-ILS/src/extras/import/pg_loader.pl
+++ b/Open-ILS/src/extras/import/pg_loader.pl
@@ -1,8 +1,6 @@
#!/usr/bin/perl
use strict;
-use lib '/openils/lib/perl5/';
-
use OpenSRF::System;
use OpenSRF::EX qw/:try/;
use OpenSRF::Utils::SettingsClient;
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
index f4c816b..8701098 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
@@ -1,8 +1,6 @@
package OpenILS::WWW::AddedContent;
use strict; use warnings;
-use lib qw(/usr/lib/perl5/Bundle/);
-
use CGI;
use Apache2::Log;
use Apache2::Const -compile => qw(OK REDIRECT DECLINED NOT_FOUND :log);
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/apache/eg.conf | 1 -
Open-ILS/examples/apache/startup.pl | 1 -
Open-ILS/src/extras/import/direct_ingest.pl | 2 --
Open-ILS/src/extras/import/direct_loader.pl | 2 --
Open-ILS/src/extras/import/pg_loader.pl | 2 --
.../src/perlmods/lib/OpenILS/WWW/AddedContent.pm | 2 --
Open-ILS/tests/datasets/README | 4 ++--
7 files changed, 2 insertions(+), 12 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list