Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/107316
Change subject: Updating list-roles helper regex
......................................................................
Updating list-roles helper regex
Also changing confirmation text after adding a role. s/commit/apply
Change-Id: Iefe459d03a64fbe85a479f9d3a3875ebc0edefec
---
M lib/mediawiki-vagrant/helpers.rb
M lib/mediawiki-vagrant/roles.rb
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/16/107316/1
diff --git a/lib/mediawiki-vagrant/helpers.rb b/lib/mediawiki-vagrant/helpers.rb
index f8ad096..b9bd58e 100644
--- a/lib/mediawiki-vagrant/helpers.rb
+++ b/lib/mediawiki-vagrant/helpers.rb
@@ -36,7 +36,7 @@
def roles_available
IO.readlines(File.join $manifest_path, 'roles.pp').map { |line|
- /^[^#]*role::(\S+)/.match(line) and $1.tr(':', '#')
+ /^class\s*role::(\S+)/.match(line) and $1.tr(':', '#')
}.compact.sort.uniq - ['generic', 'mediawiki']
end
diff --git a/lib/mediawiki-vagrant/roles.rb b/lib/mediawiki-vagrant/roles.rb
index c7a2f6f..5ededf9 100644
--- a/lib/mediawiki-vagrant/roles.rb
+++ b/lib/mediawiki-vagrant/roles.rb
@@ -1,5 +1,5 @@
module MediaWikiVagrant
- COMMIT_CHANGES = "Ok. Run 'vagrant provision' to commit your changes."
+ COMMIT_CHANGES = "Ok. Run 'vagrant provision' to apply your changes."
class ListRoles < Vagrant.plugin(2, :command)
def execute
--
To view, visit https://gerrit.wikimedia.org/r/107316
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefe459d03a64fbe85a479f9d3a3875ebc0edefec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
