[MediaWiki-commits] [Gerrit] Specify UTF-8 encoding when reading role files - change (mediawiki/vagrant)

2016-07-06 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Specify UTF-8 encoding when reading role files
..


Specify UTF-8 encoding when reading role files

Default behavior is to fall back to system encoding, which caused
'vagrant roles' commands to break when the system encoding was
non-UTF-8.

Bug: T131460
Change-Id: I158a72198726a62d58e431e6b3a4cf0814d3ed1c
---
M lib/mediawiki-vagrant/environment.rb
M lib/mediawiki-vagrant/version.rb
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  BryanDavis: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/mediawiki-vagrant/environment.rb 
b/lib/mediawiki-vagrant/environment.rb
index 9ece5fa..952b347 100644
--- a/lib/mediawiki-vagrant/environment.rb
+++ b/lib/mediawiki-vagrant/environment.rb
@@ -150,7 +150,7 @@
 #
 def roles_available
   manifests = Dir[module_path('role/manifests/*.pp')]
-  manifests.map! { |file| File.read(file).match(/^class\s*role::(\w+)/) { 
|m| m[1] } }
+  manifests.map! { |file| File.read(file, encoding: 
'utf-8').match(/^class\s*role::(\w+)/) { |m| m[1] } }
   manifests.compact.sort.uniq - ['generic', 'mediawiki', 
'labs_initial_content']
 end
 
diff --git a/lib/mediawiki-vagrant/version.rb b/lib/mediawiki-vagrant/version.rb
index 697952d..248cebe 100644
--- a/lib/mediawiki-vagrant/version.rb
+++ b/lib/mediawiki-vagrant/version.rb
@@ -1,3 +1,3 @@
 module MediaWikiVagrant
-  VERSION = '0.13.2'
+  VERSION = '0.13.3'
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I158a72198726a62d58e431e6b3a4cf0814d3ed1c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Specify UTF-8 encoding when reading role files - change (mediawiki/vagrant)

2016-06-26 Thread Code Review 
Gergő Tisza has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/296081

Change subject: Specify UTF-8 encoding when reading role files
..

Specify UTF-8 encoding when reading role files

Default behavior is to fall back to system encoding, which caused
'vagrant roles' commands to break when the system encoding was
non-UTF-8.

Bug: T131460
Change-Id: I158a72198726a62d58e431e6b3a4cf0814d3ed1c
---
M lib/mediawiki-vagrant/environment.rb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/81/296081/1

diff --git a/lib/mediawiki-vagrant/environment.rb 
b/lib/mediawiki-vagrant/environment.rb
index 9ece5fa..01592e2 100644
--- a/lib/mediawiki-vagrant/environment.rb
+++ b/lib/mediawiki-vagrant/environment.rb
@@ -150,7 +150,7 @@
 #
 def roles_available
   manifests = Dir[module_path('role/manifests/*.pp')]
-  manifests.map! { |file| File.read(file).match(/^class\s*role::(\w+)/) { 
|m| m[1] } }
+  manifests.map! { |file| File.read(file, :encoding => 
'utf-8').match(/^class\s*role::(\w+)/) { |m| m[1] } }
   manifests.compact.sort.uniq - ['generic', 'mediawiki', 
'labs_initial_content']
 end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I158a72198726a62d58e431e6b3a4cf0814d3ed1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits