X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FmergeMessageFileList.php;h=fbba97736a17d89a145001fabc8ec4fa5d29fe85;hb=da953994c843ba2782949d66c006631944ee5aaf;hp=cea64333c2b6362d2ed637e6f6234da864c72954;hpb=9994968774d44ea5138ba1e324349e048d54f12a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index cea64333c2..fbba97736a 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -82,6 +82,9 @@ class MergeMessageFileList extends Maintenance {
 		if ( $this->hasOption( 'output' ) ) {
 			$mmfl['output'] = $this->getOption( 'output' );
 		}
+		if ( $this->hasOption( 'quiet' ) ) {
+			$mmfl['quiet'] = true;
+		}
 	}
 }
 
@@ -92,8 +95,13 @@ foreach ( $mmfl['setupFiles'] as $fileName ) {
 		continue;
 	}
 	$fileName = str_replace( '$IP', $IP, $fileName );
-	fwrite( STDERR, "Loading data from $fileName\n" );
-	include_once( $fileName );
+	if ( empty( $mmfl['quiet'] ) ) {
+		fwrite( STDERR, "Loading data from $fileName\n" );
+	}
+	if ( !include_once( $fileName ) ) {
+		fwrite( STDERR, "Unable to read $fileName\n" );
+		exit( 1 );
+	}
 }
 fwrite( STDERR, "\n" );
 $s =
@@ -120,4 +128,3 @@ if ( isset( $mmfl['output'] ) ) {
 } else {
 	echo $s;
 }
-