X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FmergeMessageFileList.php;h=bb4763135724ba8bb2b501371de8ba3da4a16fbd;hb=c584722cc2e3d33edae58d46c2149063b3fc6d72;hp=46d54744785b2e6d3b0aec708b784efcd2b0e755;hpb=4b73a8b6fbb6da651af850a7d667e6e8d59e6fce;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index 46d5474478..bb47631357 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -36,11 +36,6 @@ $mmfl = false;
  * @ingroup Maintenance
  */
 class MergeMessageFileList extends Maintenance {
-	/**
-	 * @var bool
-	 */
-	protected $hasError;
-
 	function __construct() {
 		parent::__construct();
 		$this->addOption(
@@ -81,7 +76,12 @@ class MergeMessageFileList extends Maintenance {
 		# Now find out files in a directory
 		if ( $this->hasOption( 'extensions-dir' ) ) {
 			$extdir = $this->getOption( 'extensions-dir' );
-			$entries = scandir( $extdir );
+			# Allow multiple directories to be passed with ":" as delimiter
+			$extdirs = explode( ':', $extdir );
+			$entries = [];
+			foreach ( $extdirs as $extdir ) {
+				$entries = array_merge( $entries, scandir( $extdir ) );
+			}
 			foreach ( $entries as $extname ) {
 				if ( $extname == '.' || $extname == '..' || !is_dir( "$extdir/$extname" ) ) {
 					continue;
@@ -101,7 +101,6 @@ class MergeMessageFileList extends Maintenance {
 				}
 
 				if ( !$found ) {
-					$this->hasError = true;
 					$this->error( "Extension {$extname} in {$extdir} lacks expected entry point: " .
 						"extension.json, skin.json, or {$extname}.php." );
 				}
@@ -114,10 +113,6 @@ class MergeMessageFileList extends Maintenance {
 			$mmfl['setupFiles'] = array_merge( $mmfl['setupFiles'], $extensionPaths );
 		}
 
-		if ( $this->hasError ) {
-			$this->error( "Some files are missing (see above). Giving up.", 1 );
-		}
-
 		if ( $this->hasOption( 'output' ) ) {
 			$mmfl['output'] = $this->getOption( 'output' );
 		}