From d8f7a64946294a19ca726ba9ddedf98fc99386cd Mon Sep 17 00:00:00 2001
From: "bzrmirror%bugzilla.org"
 <bzrmirror%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 10 Jul 2014 08:46:33 +0000
Subject: [PATCH] Bug 856598 - checksetup.pl should exit(1) if it fails checks.
 r=gerv, a=sgreen.

git-svn-id: svn://10.0.0.236/trunk@265455 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev       | 2 +-
 mozilla/webtools/bugzilla/.gitrev       | 2 +-
 mozilla/webtools/bugzilla/checksetup.pl | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 6d09eb0cf28..5fe692f0b5a 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9078
\ No newline at end of file
+9079
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index 22ea3525e84..8eea094793b 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-2b7da8b753521f803556416c0f01d6910dc31d76
\ No newline at end of file
+f0f51946bab6b9c85c5ebd6fc737538ce967af59
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/checksetup.pl b/mozilla/webtools/bugzilla/checksetup.pl
index c93071b88a9..145faf04e30 100755
--- a/mozilla/webtools/bugzilla/checksetup.pl
+++ b/mozilla/webtools/bugzilla/checksetup.pl
@@ -51,14 +51,14 @@ my $answers_file = $ARGV[0];
 my $silent = $answers_file && !$switch{'verbose'};
 
 print(install_string('header', get_version_and_os()) . "\n") unless $silent;
-exit if $switch{'version'};
+exit 0 if $switch{'version'};
 # Check required --MODULES--
 my $module_results = check_requirements(!$silent);
 Bugzilla::Install::Requirements::print_module_instructions(
     $module_results, !$silent);
-exit if !$module_results->{pass};
+exit 1 if !$module_results->{pass};
 # Break out if checking the modules is all we have been asked to do.
-exit if $switch{'check-modules'};
+exit 0 if $switch{'check-modules'};
 
 ###########################################################################
 # Load Bugzilla Modules