summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2016-12-21 22:32:09 +0100
committerDylan William Hardison <dylan@hardison.net>2016-12-21 22:32:18 +0100
commit72197b596fae2733383c9de70197363fdd1c05d9 (patch)
tree25f8fbd18dcc37b172fa8abc4c6c4ae423fdab5f /contrib
parent19caea8deed209e45a0a652a95a78b1485261d5e (diff)
downloadbugzilla-72197b596fae2733383c9de70197363fdd1c05d9.tar.gz
bugzilla-72197b596fae2733383c9de70197363fdd1c05d9.tar.xz
Bug 1321662 - Ensure that Carp and Carp::Heavy are only loaded after @INC is setup with the vendor bundles
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/clear-memcached.pl4
-rwxr-xr-xcontrib/clear-templates.pl3
-rwxr-xr-xcontrib/fixperms.pl3
-rwxr-xr-xcontrib/nagios_blocker_checker.pl5
4 files changed, 4 insertions, 11 deletions
diff --git a/contrib/clear-memcached.pl b/contrib/clear-memcached.pl
index 31fe3bb00..58157770a 100755
--- a/contrib/clear-memcached.pl
+++ b/contrib/clear-memcached.pl
@@ -9,9 +9,7 @@
use strict;
use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+use lib qw(. lib local/lib/perl5);
use Bugzilla;
use Bugzilla::Constants;
diff --git a/contrib/clear-templates.pl b/contrib/clear-templates.pl
index ba89cb6d5..5954e71ad 100755
--- a/contrib/clear-templates.pl
+++ b/contrib/clear-templates.pl
@@ -9,8 +9,7 @@
use strict;
use warnings;
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+use lib qw(. lib local/lib/perl5);
use Bugzilla;
use Bugzilla::Constants;
diff --git a/contrib/fixperms.pl b/contrib/fixperms.pl
index 3246fc06b..e92a31138 100755
--- a/contrib/fixperms.pl
+++ b/contrib/fixperms.pl
@@ -21,8 +21,7 @@
use strict;
use warnings;
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+use lib qw(. lib local/lib/perl5);
use Bugzilla;
use Bugzilla::Install::Filesystem qw(fix_all_file_permissions);
diff --git a/contrib/nagios_blocker_checker.pl b/contrib/nagios_blocker_checker.pl
index f0d18f509..711f54a1d 100755
--- a/contrib/nagios_blocker_checker.pl
+++ b/contrib/nagios_blocker_checker.pl
@@ -9,10 +9,7 @@
use strict;
use warnings;
-
-use FindBin;
-use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
-
+use lib qw(. lib local/lib/perl5);
use Bugzilla;
use Bugzilla::Constants;