From 8a7592dcd2a2412bde24cd6da05eaf95e2486312 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 12 Jan 2008 00:43:22 +0000
Subject: [PATCH] Bug 411910: install-module.pl aborts when trying to install
 DBD::Oracle Patch By Max Kanat-Alexander <mkanat@bugzilla.org> (module owner)
 a=mkanat

git-svn-id: svn://10.0.0.236/trunk@242936 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/install-module.pl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/mozilla/webtools/bugzilla/install-module.pl b/mozilla/webtools/bugzilla/install-module.pl
index eb9ae38e41a..a0de6d70aeb 100755
--- a/mozilla/webtools/bugzilla/install-module.pl
+++ b/mozilla/webtools/bugzilla/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) {