From: mkanat%bugzilla.org <>
Date: Sat, 12 Jan 2008 06:43:22 +0000 (+0000)
Subject: Bug 411910: install-module.pl aborts when trying to install DBD::Oracle
X-Git-Tag: bugzilla-3.1.3~400
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f66bb39e73161d3ca488fce0546932451f44df3;p=thirdparty%2Fbugzilla.git

Bug 411910: install-module.pl aborts when trying to install DBD::Oracle
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> (module owner) a=mkanat
---

diff --git a/install-module.pl b/install-module.pl
index eb9ae38e41..a0de6d70ae 100644
--- a/install-module.pl
+++ b/install-module.pl
@@ -85,13 +85,9 @@ if ($switch{'all'} || $switch{'upgrade-all'}) {
         # --all shouldn't include mod_perl2, because it can have some complex
         # 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};
         install_module($cpan_name, $can_notest);
     }
-    my $dbs = DB_MODULE;
-    foreach my $db (keys %$dbs) {
-        install_module($dbs->{$db}->{dbd}->{module}, $can_notest)
-            unless have_vers($dbs->{$db}->{dbd}, 0);
-    }
 }
 
 foreach my $module (@ARGV) {