jenkins-bot has submitted this change and it was merged.

Change subject: Try to fix some other broken-looking legacy maintenance script 
options
......................................................................


Try to fix some other broken-looking legacy maintenance script options

Bug: T125748
Change-Id: I2004d9b1fd7389623a3f2da6682f9007efd679dc
---
M maintenance/language/checkDupeMessages.php
M maintenance/language/checkLanguage.php
M maintenance/language/transstat.php
M maintenance/mcc.php
M maintenance/preprocessorFuzzTest.php
M maintenance/storage/checkStorage.php
M maintenance/storage/moveToExternal.php
7 files changed, 15 insertions(+), 3 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/language/checkDupeMessages.php 
b/maintenance/language/checkDupeMessages.php
index 5d48244..baa9c71 100644
--- a/maintenance/language/checkDupeMessages.php
+++ b/maintenance/language/checkDupeMessages.php
@@ -21,6 +21,7 @@
  * @ingroup MaintenanceLanguage
  */
 
+$optionsWithArgs = [ 'lang', 'clang', 'mode' ];
 require_once __DIR__ . '/../commandLine.inc';
 $messagesDir = __DIR__ . '/../../languages/messages/';
 $runTest = false;
diff --git a/maintenance/language/checkLanguage.php 
b/maintenance/language/checkLanguage.php
index bd9f9af..a8cbac1 100644
--- a/maintenance/language/checkLanguage.php
+++ b/maintenance/language/checkLanguage.php
@@ -21,6 +21,12 @@
  * @ingroup MaintenanceLanguage
  */
 
+$optionsWithArgs = [
+       'lang', 'level', 'blacklist', 'whitelist', 'wikilang', 'output', 
'prefix'
+];
+$optionsWithoutArgs = [
+       'help', 'links', 'noexif', 'easy', 'duplicate', 'all'
+];
 require_once __DIR__ . '/../commandLine.inc';
 require_once 'checkLanguage.inc';
 require_once 'languages.inc';
diff --git a/maintenance/language/transstat.php 
b/maintenance/language/transstat.php
index ca94473..7202952 100644
--- a/maintenance/language/transstat.php
+++ b/maintenance/language/transstat.php
@@ -27,6 +27,7 @@
  * https://www.mediawiki.org/wiki/Localisation_statistics
  */
 $optionsWithArgs = [ 'output' ];
+$optionsWithoutArgs = [ 'help' ];
 
 require_once __DIR__ . '/../commandLine.inc';
 require_once 'languages.inc';
diff --git a/maintenance/mcc.php b/maintenance/mcc.php
index 0fff823..784ba0e 100644
--- a/maintenance/mcc.php
+++ b/maintenance/mcc.php
@@ -22,10 +22,11 @@
  * @ingroup Maintenance
  */
 
-/** */
+$optionsWithArgs = [ 'cache' ];
+$optionsWithoutArgs = [
+       'debug', 'help'
+];
 require_once __DIR__ . '/commandLine.inc';
-
-$options = getopt( '', [ 'debug', 'help', 'cache:' ] );
 
 $debug = isset( $options['debug'] );
 $help = isset( $options['help'] );
diff --git a/maintenance/preprocessorFuzzTest.php 
b/maintenance/preprocessorFuzzTest.php
index 4f478ac..aa5d69d 100644
--- a/maintenance/preprocessorFuzzTest.php
+++ b/maintenance/preprocessorFuzzTest.php
@@ -21,6 +21,7 @@
  * @ingroup Maintenance
  */
 
+$optionsWithoutArgs = [ 'verbose' ];
 require_once __DIR__ . '/commandLine.inc';
 
 $wgHooks['BeforeParserFetchTemplateAndtitle'][] = 'PPFuzzTester::templateHook';
diff --git a/maintenance/storage/checkStorage.php 
b/maintenance/storage/checkStorage.php
index 9da3909..d69e5b9 100644
--- a/maintenance/storage/checkStorage.php
+++ b/maintenance/storage/checkStorage.php
@@ -22,6 +22,7 @@
  */
 
 if ( !defined( 'MEDIAWIKI' ) ) {
+       $optionsWithoutArgs = [ 'fix' ];
        require_once __DIR__ . '/../commandLine.inc';
 
        $cs = new CheckStorage;
diff --git a/maintenance/storage/moveToExternal.php 
b/maintenance/storage/moveToExternal.php
index 776b72f..80dc7f9 100644
--- a/maintenance/storage/moveToExternal.php
+++ b/maintenance/storage/moveToExternal.php
@@ -24,6 +24,7 @@
 define( 'REPORTING_INTERVAL', 1 );
 
 if ( !defined( 'MEDIAWIKI' ) ) {
+       $optionsWithArgs = [ 'e', 's' ];
        require_once __DIR__ . '/../commandLine.inc';
        require_once 'resolveStubs.php';
 

-- 
To view, visit https://gerrit.wikimedia.org/r/268328
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2004d9b1fd7389623a3f2da6682f9007efd679dc
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to