summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kanat-Alexander <mkanat@bugzilla.org>2010-03-09 05:30:09 +0100
committerMax Kanat-Alexander <mkanat@bugzilla.org>2010-03-09 05:30:09 +0100
commitb04d384d144019f86b92cb8b729cdf18a821c097 (patch)
tree9598edf50f47bf43822e2c3b6367dea56314e8f6
parent9947ffcb75bcb1f27b07cc9d849f69ed97996d7e (diff)
downloadbugzilla-b04d384d144019f86b92cb8b729cdf18a821c097.tar.gz
bugzilla-b04d384d144019f86b92cb8b729cdf18a821c097.tar.xz
Bug 551104: Don't install DBD::Pg when using install-module.pl --all unless
the PostgreSQL devel files are actually installed. r=mkanat, a=mkanat (module owner)
-rwxr-xr-xinstall-module.pl2
1 files changed, 2 insertions, 0 deletions
diff --git a/install-module.pl b/install-module.pl
index 44457c400..f3c6ba461 100755
--- a/install-module.pl
+++ b/install-module.pl
@@ -35,6 +35,7 @@ use Bugzilla::Install::CPAN;
use Bugzilla::Constants;
use Bugzilla::Install::Requirements;
+use Bugzilla::Install::Util qw(bin_loc);
use Data::Dumper;
use Getopt::Long;
@@ -101,6 +102,7 @@ if ($switch{'all'} || $switch{'upgrade-all'}) {
# configuration, and really should be installed on its own.
next if $cpan_name eq 'mod_perl2';
next if $cpan_name eq 'DBD::Oracle' and !$ENV{ORACLE_HOME};
+ next if $cpan_name eq 'DBD::Pg' and !bin_loc('pg_config');
install_module($cpan_name, $can_notest);
}
}