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
This commit is contained in:
bzrmirror%bugzilla.org 2014-07-10 08:46:33 +00:00
parent c4292d301f
commit d8f7a64946
3 changed files with 5 additions and 5 deletions

View File

@ -1 +1 @@
9078 9079

View File

@ -1 +1 @@
2b7da8b753521f803556416c0f01d6910dc31d76 f0f51946bab6b9c85c5ebd6fc737538ce967af59

View File

@ -51,14 +51,14 @@ my $answers_file = $ARGV[0];
my $silent = $answers_file && !$switch{'verbose'}; my $silent = $answers_file && !$switch{'verbose'};
print(install_string('header', get_version_and_os()) . "\n") unless $silent; print(install_string('header', get_version_and_os()) . "\n") unless $silent;
exit if $switch{'version'}; exit 0 if $switch{'version'};
# Check required --MODULES-- # Check required --MODULES--
my $module_results = check_requirements(!$silent); my $module_results = check_requirements(!$silent);
Bugzilla::Install::Requirements::print_module_instructions( Bugzilla::Install::Requirements::print_module_instructions(
$module_results, !$silent); $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. # 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 # Load Bugzilla Modules