From 2992c0b59dca62262634c8ccae4c1e99894ade6b Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" Date: Wed, 7 Apr 2010 14:47:54 +0000 Subject: [PATCH] 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 git-svn-id: svn://10.0.0.236/trunk@260165 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/.bzrrev | 2 +- mozilla/webtools/bugzilla/Bugzilla/Config/Common.pm | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index 84dae26f40b..b6655f3d501 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -7118 \ No newline at end of file +7119 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/Common.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/Common.pm index 6924761f358..7416b17942d 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Config/Common.pm +++ b/mozilla/webtools/bugzilla/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";