From 516ac2aed77eb1a6f8f06320ecf502a4dd6a44ed Mon Sep 17 00:00:00 2001
From: Dylan Hardison <dylan@mozilla.com>
Date: Mon, 9 May 2016 19:20:19 -0400
Subject: Bug 1270550 - Can't locate loadable object for module
 main::Tie::Hash::NamedCapture in @INC r=dkl

---
 Bugzilla.pm                     | 2 ++
 Bugzilla/DB/Schema.pm           | 2 ++
 Bugzilla/Install/Localconfig.pm | 1 +
 Bugzilla/Migrate.pm             | 2 ++
 checksetup.pl                   | 2 ++
 5 files changed, 9 insertions(+)

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 802f15845..032d08355 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -45,6 +45,8 @@ use File::Basename;
 use File::Spec::Functions;
 use DateTime::TimeZone;
 use Date::Parse;
+# Bug 1270550 - Tie::Hash::NamedCapture must be loaded before Safe.
+use Tie::Hash::NamedCapture;
 use Safe;
 use List::Util qw(first);
 
diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 8b00e627e..062dd73f4 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -28,6 +28,8 @@ use Carp qw(confess);
 use Digest::MD5 qw(md5_hex);
 use Hash::Util qw(lock_value unlock_hash lock_keys unlock_keys);
 use List::MoreUtils qw(firstidx natatime);
+# Bug 1270550 - Tie::Hash::NamedCapture must be loaded before Safe.
+use Tie::Hash::NamedCapture;
 use Safe;
 # Historical, needed for SCHEMA_VERSION = '1.00'
 use Storable qw(dclone freeze thaw);
diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index 4a3b09f83..d5de236e0 100644
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -27,6 +27,7 @@ use Data::Dumper;
 use File::Basename qw(dirname);
 use English qw($EGID);
 use List::Util qw(first);
+use Tie::Hash::NamedCapture;
 use Safe;
 use Term::ANSIColor;
 
diff --git a/Bugzilla/Migrate.pm b/Bugzilla/Migrate.pm
index 5a2defe15..b23fc5b53 100644
--- a/Bugzilla/Migrate.pm
+++ b/Bugzilla/Migrate.pm
@@ -30,6 +30,8 @@ use DateTime;
 use Fcntl qw(SEEK_SET);
 use File::Basename;
 use List::Util qw(first);
+# Bug 1270550 - Tie::Hash::NamedCapture must be loaded before Safe.
+use Tie::Hash::NamedCapture;
 use Safe;
 
 use constant CUSTOM_FIELDS      => {};
diff --git a/checksetup.pl b/checksetup.pl
index 05d98f9e1..32ef69d45 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -22,6 +22,8 @@ use lib qw(. lib local/lib/perl5);
 
 use Getopt::Long qw(:config bundling);
 use Pod::Usage;
+# Bug 1270550 - Tie::Hash::NamedCapture must be loaded before Safe.
+use Tie::Hash::NamedCapture;
 use Safe;
 
 use Bugzilla::Constants;
-- 
cgit v1.2.3-24-g4f1b