Commit dc391b55 authored by mkanat%bugzilla.org's avatar mkanat%bugzilla.org

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
parent aadb30fd
......@@ -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'};
}
}
}
......
......@@ -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};
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment