Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 999296: make checksetup.pl not complain about having added new

Browse Source 
values to localconfig when the answers were supplied by an answer file.
r=LpSolit, a=justdave


git-svn-id: svn://10.0.0.236/trunk@265377 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2014-05-02 02:30:46 +00:00
parent 06020872ed
commit bdc9ffd820
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
9014 9015

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
7c6963dd64b89fd63810d694da90762d7273aaf7 082cea0bf161689e2c45750d364c87b46dc87089

10
mozilla/webtools/bugzilla/Bugzilla/Install/Localconfig.pm
View File

@ -222,14 +222,20 @@ sub update_localconfig {
# a 256-character string for site_wide_secret. # a 256-character string for site_wide_secret.
$value = undef if ($name eq 'site_wide_secret' and defined $value $value = undef if ($name eq 'site_wide_secret' and defined $value
and length($value) == 256); and length($value) == 256);
if (!defined $value) { if (!defined $value) {
push(@new_vars, $name);
$var->{default} = &{$var->{default}} if ref($var->{default}) eq 'CODE'; $var->{default} = &{$var->{default}} if ref($var->{default}) eq 'CODE';
if (exists $answer->{$name}) { if (exists $answer->{$name}) {
$localconfig->{$name} = $answer->{$name}; $localconfig->{$name} = $answer->{$name};
} }
else { else {
# If the user did not supply an answers file, then they get
# notified about every variable that gets added. If there was
# an answer file, then we don't notify about site_wide_secret
# because we assume the intent was to auto-generate it anyway.
if (!scalar(keys %$answer) || $name ne 'site_wide_secret') {
push(@new_vars, $name);
}
$localconfig->{$name} = $var->{default}; $localconfig->{$name} = $var->{default};
} }
} }