jenkins-bot has submitted this change and it was merged.
Change subject: Support multiple extension-dir paths to be passed to
mergeMessageFileList
......................................................................
Support multiple extension-dir paths to be passed to mergeMessageFileList
If scap is modified to pass the path to both extensions/ and skins/ then
the extension-list file in wmf-config will no longer be needed, eliminating
many headaches. (refs T125678)
Bug: T125678
Change-Id: I4fd0c99d68fa32bf2378691955850a1be2c022df
---
M maintenance/mergeMessageFileList.php
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/mergeMessageFileList.php
b/maintenance/mergeMessageFileList.php
index 46d5474..a650aa0 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -81,7 +81,12 @@
# 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;
--
To view, visit https://gerrit.wikimedia.org/r/268337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4fd0c99d68fa32bf2378691955850a1be2c022df
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 20after4 <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
