[MediaWiki-commits] [Gerrit] Bugfix for 'reset-roles' argument handling - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged. Change subject: Bugfix for 'reset-roles' argument handling .. Bugfix for 'reset-roles' argument handling Vagrant now includes the subcommand itself in @argv, so the @argv.empty? check in the reset-roles command is never true. Checking that the length is greater than 1 would match the old behavior exactly but at the cost of backward-incompatibility. Change-Id: I2780abb611fc5a07b65a61150674e23648e3e9b7 --- M lib/mediawiki-vagrant/roles.rb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/mediawiki-vagrant/roles.rb b/lib/mediawiki-vagrant/roles.rb index c7a2f6f..e817c30 100644 --- a/lib/mediawiki-vagrant/roles.rb +++ b/lib/mediawiki-vagrant/roles.rb @@ -59,7 +59,7 @@ class ResetRoles Vagrant.plugin(2, :command) def execute -if not @argv.empty? or ['-h', '--help'].include? @argv.first +if ['-h', '--help'].include? @argv.first @env.ui.info 'Disable all optional roles.' @env.ui.info 'USAGE: vagrant reset-roles' return 0 -- To view, visit https://gerrit.wikimedia.org/r/107202 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2780abb611fc5a07b65a61150674e23648e3e9b7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bugfix for 'reset-roles' argument handling - change (mediawiki/vagrant)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/107202 Change subject: Bugfix for 'reset-roles' argument handling .. Bugfix for 'reset-roles' argument handling Vagrant now includes the subcommand itself in @argv, so the @argv.empty? check in the reset-roles command is never true. Checking that the length is greater than 1 would match the old behavior exactly but at the cost of backward-incompatibility. Change-Id: I2780abb611fc5a07b65a61150674e23648e3e9b7 --- M lib/mediawiki-vagrant/roles.rb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/02/107202/1 diff --git a/lib/mediawiki-vagrant/roles.rb b/lib/mediawiki-vagrant/roles.rb index c7a2f6f..e817c30 100644 --- a/lib/mediawiki-vagrant/roles.rb +++ b/lib/mediawiki-vagrant/roles.rb @@ -59,7 +59,7 @@ class ResetRoles Vagrant.plugin(2, :command) def execute -if not @argv.empty? or ['-h', '--help'].include? @argv.first +if ['-h', '--help'].include? @argv.first @env.ui.info 'Disable all optional roles.' @env.ui.info 'USAGE: vagrant reset-roles' return 0 -- To view, visit https://gerrit.wikimedia.org/r/107202 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2780abb611fc5a07b65a61150674e23648e3e9b7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
