From 72197b596fae2733383c9de70197363fdd1c05d9 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Wed, 21 Dec 2016 16:32:09 -0500
Subject: Bug 1321662 - Ensure that Carp and Carp::Heavy are only loaded after
 @INC is setup with the vendor bundles

---
 extensions/TrackingFlags/bin/bug_825946.pl             | 3 +--
 extensions/TrackingFlags/bin/bulk_flag_clear.pl        | 3 +--
 extensions/TrackingFlags/bin/migrate_tracking_flags.pl | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'extensions/TrackingFlags')

diff --git a/extensions/TrackingFlags/bin/bug_825946.pl b/extensions/TrackingFlags/bin/bug_825946.pl
index 8f48a671a..20d21aea5 100755
--- a/extensions/TrackingFlags/bin/bug_825946.pl
+++ b/extensions/TrackingFlags/bin/bug_825946.pl
@@ -9,8 +9,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/TrackingFlags/bin/bulk_flag_clear.pl b/extensions/TrackingFlags/bin/bulk_flag_clear.pl
index 6b05a50a3..e599d8e51 100755
--- a/extensions/TrackingFlags/bin/bulk_flag_clear.pl
+++ b/extensions/TrackingFlags/bin/bulk_flag_clear.pl
@@ -9,8 +9,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 BEGIN {
     use Bugzilla;
diff --git a/extensions/TrackingFlags/bin/migrate_tracking_flags.pl b/extensions/TrackingFlags/bin/migrate_tracking_flags.pl
index bca03f9f9..0081462d9 100755
--- a/extensions/TrackingFlags/bin/migrate_tracking_flags.pl
+++ b/extensions/TrackingFlags/bin/migrate_tracking_flags.pl
@@ -12,8 +12,7 @@
 use strict;
 use warnings;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib qw(. lib local/lib/perl5);
 
 BEGIN {
     use Bugzilla;
-- 
cgit v1.2.3-24-g4f1b