jenkins-bot has submitted this change and it was merged. Change subject: Fixup versions in populateWikiversions ......................................................................
Fixup versions in populateWikiversions Remove weird "confirm" parameter Change-Id: I67ffa56b048829bfff6658ae709cc814b999900d --- M multiversion/populateWikiversions 1 file changed, 5 insertions(+), 6 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/multiversion/populateWikiversions b/multiversion/populateWikiversions index 914aa78..a368449 100755 --- a/multiversion/populateWikiversions +++ b/multiversion/populateWikiversions @@ -11,8 +11,7 @@ * as keys, each having a value of the specified MediaWiki version. * This means that all will be configured to run that version. * - * The first argument is the version, typically of the format "php-X.XX". - * The second argument is a confirmation ("confirm"). + * The first argument is the version, typically of the format "php-X.XXwmfX". * * @return void */ @@ -20,15 +19,15 @@ global $argv; $argsValid = false; - if ( count( $argv ) >= 3 && $argv[2] === 'confirm' ) { - $version = $argv[1]; // e.g. "php-X.XX" - if ( preg_match( '/^php-(?:\d+\.\d+|trunk)(?:-\d)?$/', $version ) ) { + if ( count( $argv ) == 2 ) { + $version = $argv[1]; // e.g. "php-X.XXwmfX" + if ( preg_match( '/^php-(\d+\.\d+wmf\d+|master)$/', $version ) ) { $argsValid = true; } } if ( !$argsValid ) { - print "Usage: populateWikiversions php-X.XX confirm\n"; + print "Usage: populateWikiversions php-X.XXwmfX\n"; exit( 1 ); } -- To view, visit https://gerrit.wikimedia.org/r/114630 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I67ffa56b048829bfff6658ae709cc814b999900d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy <re...@wikimedia.org> 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