Revert r58033. This change made all command line scripts of the Translate extension...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f074969..1a402e9 100644 (file)
--- 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 <math> 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 8055af4..bcd2913 100644 (file)
--- 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 77286c3..cb6faf3 100644 (file)
--- 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 ) );