From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 7 Apr 2010 14:35:51 +0000 (+0200)
Subject: Bug 557806: When setting the upgrade_notification parameter, an error should be throw... 
X-Git-Tag: bugzilla-3.6~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8ed83ed351bd4bddf8b913c538c542622c664eb;p=thirdparty%2Fbugzilla.git

Bug 557806: When setting the upgrade_notification parameter, an error should be thrown if you don't have all the required Perl modules installed
r=glob a=LpSolit
---

diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm
index 6924761f35..7416b17942 100644
--- a/Bugzilla/Config/Common.pm
+++ b/Bugzilla/Config/Common.pm
@@ -334,6 +334,10 @@ sub check_notification {
                "about the next stable release, you should select " .
                "'latest_stable_release' instead";
     }
+    if ($option ne 'disabled' && !Bugzilla->feature('updates')) {
+        return "Some Perl modules are missing to get notifications about " .
+               "new releases. See the output of checksetup.pl for more information";
+    }
     return "";
 }
 
@@ -347,7 +351,8 @@ sub check_smtp_auth {
 }
 
 sub check_theschwartz_available {
-    if (!eval { require TheSchwartz; require Daemon::Generic; }) {
+    my $use_queue = shift;
+    if ($use_queue && !Bugzilla->feature('jobqueue')) {
         return "Using the job queue requires that you have certain Perl"
                . " modules installed. See the output of checksetup.pl"
                . " for more information";