Bug 1174736: The cpanfile generated by checksetup results in an unsuccessful mod_perl...

r=emorley,a=simon

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index b48487c31c91a5cd68c755f75ab268a03d488683..9213d5058bd375b03af7e85215bf8df7fc6b3546 100644 (file)
--- 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