diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2017-10-07 00:11:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-07 00:11:25 +0200 |
| commit | bbfe30297f0a56d4d384f60e0ff20e7c67e08d7a (patch) | |
| tree | b2f34eca75df83ecc1f8da1f5d59184bcad242b0 /checksetup.pl | |
| parent | 6fe0afaa39271bbd75cf068abd67b19fd062a843 (diff) | |
| download | bugzilla-bbfe30297f0a56d4d384f60e0ff20e7c67e08d7a.tar.gz bugzilla-bbfe30297f0a56d4d384f60e0ff20e7c67e08d7a.tar.xz | |
Bug 1404092 - Bugzilla->localconfig should directly use environmental variables and ignore the localconfig file
Diffstat (limited to 'checksetup.pl')
| -rwxr-xr-x | checksetup.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/checksetup.pl b/checksetup.pl index 99ee12e37..1b4df3c2f 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -149,8 +149,10 @@ Bugzilla->installation_answers($answers_file); # Check and update --LOCAL-- configuration ########################################################################### -print "Reading " . bz_locations()->{'localconfig'} . "...\n" unless $silent; -update_localconfig({ output => !$silent, use_defaults => $switch{'default-localconfig'} }); +unless ($ENV{LOCALCONFIG_ENV}) { + print "Reading " . bz_locations()->{'localconfig'} . "...\n" unless $silent; + update_localconfig({ output => !$silent, use_defaults => $switch{'default-localconfig'} }); +} my $lc_hash = Bugzilla->localconfig; ########################################################################### |