From: lpsolit%gmail.com <>
Date: Mon, 12 Sep 2005 17:47:12 +0000 (+0000)
Subject: Bug 306760: Routines from Util.pm are not imported in checksetup.pl due to a typo... 
X-Git-Tag: bugzilla-2.21.1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53fe5d4d04525d7ef944f1ce60a323a5b767d769;p=thirdparty%2Fbugzilla.git

Bug 306760: Routines from Util.pm are not imported in checksetup.pl due to a typo: Bugzilla:Util (missing colon) - Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit a=justdave
---

diff --git a/checksetup.pl b/checksetup.pl
index 13d5e0782c..1ad8124cfb 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -1439,18 +1439,17 @@ if ($^O !~ /MSWin32/i) {
 # This is done here, because some modules require params to be set up, which
 # won't have happened earlier.
 
-# It's never safe to directly "use" a module in checksetup. If a module
+# It's never safe to "use" a Bugzilla module in checksetup. If a module
 # prerequisite is missing, and you "use" a module that requires it,
 # then instead of our nice normal checksetup message the user would
 # get a cryptic perl error about the missing module.
 
-# So, we always wrap our "use" statements in checksetup in a string eval.
-
 # This is done so we can add new settings as developers need them.
 require Bugzilla::User::Setting;
 import Bugzilla::User::Setting qw(add_setting);
 
-eval("use Bugzilla:Util");
+require Bugzilla::Util;
+import Bugzilla::Util qw(bz_crypt trim html_quote);
 
 # globals.pl clears the PATH, but File::Find uses Cwd::cwd() instead of
 # Cwd::getcwd(), which we need to do because `pwd` isn't in the path - see