From 765e66aa68239bdb1b6496325d8b56d900bee447 Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Fri, 16 Sep 2011 09:59:54 -0400 Subject: [PATCH] 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 Signed-off-by: Galen Charlton --- 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 -- Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm | 2 -- 5 files changed, 9 deletions(-) diff --git a/Open-ILS/examples/apache/startup.pl b/Open-ILS/examples/apache/startup.pl index f82844717f..6f1a74261d 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 45df729332..e25193e47e 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 02c3f36691..4a3dd0b84f 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 cde91dea5e..f469d15fab 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 f4c816b2dc..87010989b9 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); -- 2.11.0