From: David Lawrence <dkl@mozilla.com>
Date: Tue, 28 Jul 2015 14:51:00 +0000 (+0000)
Subject: Bug 1174736: The cpanfile generated by checksetup results in an unsuccessful mod_perl... 
X-Git-Tag: release-5.1.1~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d96c58a0c746df107b4ca85255b360481c68e89;p=thirdparty%2Fbugzilla.git

Bug 1174736: The cpanfile generated by checksetup results in an unsuccessful mod_perl install
r=emorley,a=simon
---

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index b48487c31c..9213d5058b 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -890,6 +890,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