From ed1bcec007e5c0103be4ee53fe8d304a1a1d7c73 Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Tue, 23 May 2006 01:11:53 +0000 Subject: Bug 328642: Params should be in Bugzilla->params instead of being a Bugzilla::Config subroutine Patch By Max Kanat-Alexander r=LpSolit, a=justdave --- checksetup.pl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'checksetup.pl') diff --git a/checksetup.pl b/checksetup.pl index 4a059f1c7..a2564f0a6 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -465,7 +465,16 @@ if ($^O =~ /MSWin/i) { # Global definitions ########################################################################### -use Bugzilla::Config qw(:DEFAULT :admin :locations); +# These don't work as a "use," and they don't work as a "require" outside +# of a BEGIN block. However, we're safe to them in a BEGIN block here since +# we've already checked all of the pre-requisites above in the previous +# BEGIN block. +BEGIN { + require Bugzilla; + + require Bugzilla::Config; + import Bugzilla::Config qw(:DEFAULT :admin :locations); +} # 12/17/00 justdave@syndicomm.com - removed declarations of the localconfig # variables from this location. We don't want these declared here. They'll -- cgit v1.2.3-24-g4f1b