summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@mozilla.com>2015-07-17 10:21:36 +0200
committerDavid Lawrence <dkl@mozilla.com>2015-07-17 10:21:36 +0200
commitb217cb01e0d9588f8ed94a577c20eb9cb500e176 (patch)
tree6e1e53bb29ecb579f93a90545b56a9033dee7d8f
parentbb5c5a5e62d2fd96f9b4a7339cbb0cbb33209745 (diff)
downloadbugzilla-b217cb01e0d9588f8ed94a577c20eb9cb500e176.tar.gz
bugzilla-b217cb01e0d9588f8ed94a577c20eb9cb500e176.tar.xz
Bug 1184982 - Backport upstream bug 1174736 to bmo/4.2 to fix issue where checksetup results in an unsuccessful mod_perl install
-rw-r--r--Bugzilla/Install/Requirements.pm1
1 files changed, 1 insertions, 0 deletions
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