From: Tim Starling <tstarling@wikimedia.org>
Date: Fri, 5 Apr 2013 01:03:31 +0000 (+1100)
Subject: mergeMessageFileList.php: abort on read error
X-Git-Tag: 1.31.0-rc.0~20096^2
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=9c5d996773cd3277b60c9985bfb87d860df0d276;p=lhc%2Fweb%2Fwiklou.git

mergeMessageFileList.php: abort on read error

If there is a parse error or if one of the files in the extension list
doesn't exist, exit with an error. mw-update-l10n has set -e so it will
abort without syncing the new file.

Change-Id: Idaad65783127b075626c102a8dc02e22df1588b7
---

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index 62596b2074..fbba97736a 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -98,7 +98,10 @@ foreach ( $mmfl['setupFiles'] as $fileName ) {
 	if ( empty( $mmfl['quiet'] ) ) {
 		fwrite( STDERR, "Loading data from $fileName\n" );
 	}
-	include_once( $fileName );
+	if ( !include_once( $fileName ) ) {
+		fwrite( STDERR, "Unable to read $fileName\n" );
+		exit( 1 );
+	}
 }
 fwrite( STDERR, "\n" );
 $s =