From b217cb01e0d9588f8ed94a577c20eb9cb500e176 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Fri, 17 Jul 2015 08:21:36 +0000
Subject: Bug 1184982 - Backport upstream bug 1174736 to bmo/4.2 to fix issue
 where checksetup results in an unsuccessful mod_perl install

---
 Bugzilla/Install/Requirements.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Bugzilla/Install')

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 1b610287d..71c01b9be 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -806,6 +806,7 @@ sub export_cpanfile {
     $cpanfile .= "\n# Optional\n";
     my %features;
     foreach my $module (@{ OPTIONAL_MODULES() }) {
+        next if $module->{package} eq 'mod_perl'; # Skip mod_perl since this would be installed by distro
         if (exists $module->{feature}) {
             foreach my $feature (@{ $module->{feature} }) {
                 # cpanm requires that each feature only be defined in the cpanfile
-- 
cgit v1.2.3-24-g4f1b