From 0c989fbcc173536f200e729c353fc6d52b52ab1a Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 22 Oct 2009 21:43:30 +0000 Subject: [PATCH] Revert r58033. This change made all command line scripts of the Translate extension (scripts/ subfolder) exit without any information or without doing anything. --- RELEASE-NOTES | 1 - maintenance/Maintenance.php | 2 +- maintenance/doMaintenance.php | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index f074969b67..1a402e93b2 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -258,7 +258,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN the parser so extensions are free to implement their own tag * (bug 21047) Wrap 'cannotdelete' into a div with the generic 'error' class and an own 'mw-error-cannotdelete' class -* Maintenance scripts now set nonzero exit codes when terminating due to error === Bug fixes in 1.16 === diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php index 8055af460b..bcd2913a20 100644 --- a/maintenance/Maintenance.php +++ b/maintenance/Maintenance.php @@ -232,7 +232,7 @@ abstract class Maintenance { fwrite( $f, $err . "\n" ); fclose( $f ); } - if( $die ) exit( 1 ); + if( $die ) die(); } /** diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index 77286c3b33..cb6faf3070 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -86,13 +86,10 @@ $wgTitle = null; // Do the work try { - $result = $maintenance->execute(); + $maintenance->execute(); } catch( MWException $mwe ) { echo( $mwe->getText() ); - $result = 1; } // Potentially debug globals $maintenance->globals(); - -exit( intval( $result ) ); -- 2.20.1