Bug 306760: Routines from Util.pm are not imported in checksetup.pl due to a typo...

diff --git a/checksetup.pl b/checksetup.pl
index 13d5e0782ca9c52487f9fd2dea7912253afa1533..1ad8124cfb9f233103615e15c67788af1da0dc82 100755 (executable)
--- 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