From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Tue, 9 Mar 2010 04:31:11 +0000 (-0800)
Subject: Bug 551104: Don't install DBD::Pg when using install-module.pl --all unless
X-Git-Tag: bugzilla-3.6~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=165806a9a34822df80a0da4a73e1dc7d762fe853;p=thirdparty%2Fbugzilla.git

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)
---

diff --git a/install-module.pl b/install-module.pl
index 241972211b..bfee113b75 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;
@@ -98,6 +99,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);
     }
 }