From dc391b5583836b71cc8f68789fb48b712d7fa6b5 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Wed, 30 Sep 2009 11:42:50 +0000
Subject: Bug 519676: Allow users to set blank/false values for things in
 checksetup.pl's "answers" file. Patch by Max Kanat-Alexander
 <mkanat@bugzilla.org> (module owner) a=mkanat

---
 Bugzilla/Config.pm              | 7 ++++++-
 Bugzilla/Install/Localconfig.pm | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm
index 4074abcd1..a20751737 100644
--- a/Bugzilla/Config.pm
+++ b/Bugzilla/Config.pm
@@ -199,7 +199,12 @@ sub update_params {
         my $name = $item->{'name'};
         unless (exists $param->{$name}) {
             print "New parameter: $name\n" unless $new_install;
-            $param->{$name} = $answer->{$name} || $item->{'default'};
+            if (exists $answer->{$name}) {
+                $param->{$name} = $answer->{$name};
+            }
+            else {
+                $param->{$name} = $item->{'default'};
+            }
         }
     }
 
diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index 971064722..346746655 100644
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -326,7 +326,12 @@ sub update_localconfig {
         if (!defined $localconfig->{$name}) {
             push(@new_vars, $name);
             $var->{default} = &{$var->{default}} if ref($var->{default}) eq 'CODE';
-            $localconfig->{$name} = $answer->{$name} || $var->{default};
+            if (exists $answer->{$name}) {
+                $localconfig->{$name} = $answer->{$name};
+            }
+            else {
+                $localconfig->{$name} = $var->{default};
+            }
         }
     }
 
-- 
cgit v1.2.3-24-g4f1b