jenkins-bot has submitted this change and it was merged.
Change subject: Don't hard fail when we couldn't find an entry point for an
extension
......................................................................
Don't hard fail when we couldn't find an entry point for an extension
It doesn't make a ton of sense, it's just pointing out that we have
a weird extension for which we cannot detect a standard entry point
for. These (unfortunately) exist, but they're easily worked around
using --list-file
Removing the hard failure allows you to use the two options in
tandem... --extension-dir for the initial pass and then --list-file
for the weirdo outstanding ones
Change-Id: I3d9cf1d614dacaa91fb2092019ccf1d14d61ccab
---
M maintenance/mergeMessageFileList.php
1 file changed, 0 insertions(+), 10 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/mergeMessageFileList.php
b/maintenance/mergeMessageFileList.php
index a650aa0..bb47631 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -36,11 +36,6 @@
* @ingroup Maintenance
*/
class MergeMessageFileList extends Maintenance {
- /**
- * @var bool
- */
- protected $hasError;
-
function __construct() {
parent::__construct();
$this->addOption(
@@ -106,7 +101,6 @@
}
if ( !$found ) {
- $this->hasError = true;
$this->error( "Extension {$extname} in
{$extdir} lacks expected entry point: " .
"extension.json, skin.json, or
{$extname}.php." );
}
@@ -117,10 +111,6 @@
foreach ( $wgExtensionEntryPointListFiles as $points ) {
$extensionPaths = $this->readFile( $points );
$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' ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/323982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d9cf1d614dacaa91fb2092019ccf1d14d61ccab
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
