From: wurblzap%gmail.com <>
Date: Sat, 3 Dec 2005 06:16:36 +0000 (+0000)
Subject: Bug 310070: runtests.pl reports errors when the 'shutdownhtml' parameter is turned on.
X-Git-Tag: bugzilla-2.22rc1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b8708b27ec2eaf3f220db1da3395196aad78f1f;p=thirdparty%2Fbugzilla.git

Bug 310070: runtests.pl reports errors when the 'shutdownhtml' parameter is turned on.
Patch by Marc Schumann <wurblzap@gmail.com>,
r=LpSolit, r=mkanat, a=justdave
---

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 115d15e575..86d6e6e70d 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -61,9 +61,15 @@ use constant SHUTDOWNHTML_EXIT_SILENTLY => [
 # message to the user about the downtime and log out.  Scripts listed in 
 # SHUTDOWNHTML_EXEMPT are exempt from this message.
 #
+# Because this is code which is run live from perl "use" commands of other
+# scripts, we're skipping this part if we get here during a perl syntax check
+# -- runtests.pl compiles scripts without running them, so we need to make sure
+# that this check doesn't apply to 'perl -c' calls.
+#
 # This code must go here. It cannot go anywhere in Bugzilla::CGI, because
 # it uses Template, and that causes various dependency loops.
-if (Param("shutdownhtml") 
+if (!$^C
+    && Param("shutdownhtml") 
     && lsearch(SHUTDOWNHTML_EXEMPT, basename($0)) == -1) 
 {
     # Allow non-cgi scripts to exit silently (without displaying any