dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix small typo in documentation of IDatabase"
[lhc/web/wiklou.git]
/
maintenance
/
mergeMessageFileList.php
diff --git
a/maintenance/mergeMessageFileList.php
b/maintenance/mergeMessageFileList.php
index
46d5474
..
bb47631
100644
(file)
--- a/
maintenance/mergeMessageFileList.php
+++ b/
maintenance/mergeMessageFileList.php
@@
-36,11
+36,6
@@
$mmfl = false;
* @ingroup Maintenance
*/
class MergeMessageFileList extends Maintenance {
* @ingroup Maintenance
*/
class MergeMessageFileList extends Maintenance {
- /**
- * @var bool
- */
- protected $hasError;
-
function __construct() {
parent::__construct();
$this->addOption(
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' );
# 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;
foreach ( $entries as $extname ) {
if ( $extname == '.' || $extname == '..' || !is_dir( "$extdir/$extname" ) ) {
continue;
@@
-101,7
+101,6
@@
class MergeMessageFileList extends Maintenance {
}
if ( !$found ) {
}
if ( !$found ) {
- $this->hasError = true;
$this->error( "Extension {$extname} in {$extdir} lacks expected entry point: " .
"extension.json, skin.json, or {$extname}.php." );
}
$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 );
}
$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' );
}
if ( $this->hasOption( 'output' ) ) {
$mmfl['output'] = $this->getOption( 'output' );
}