Ori.livneh has submitted this change and it was merged.
Change subject: wmflib: allow require_package('g++')
......................................................................
wmflib: allow require_package('g++')
Our puppet function require_package() convert dashes to underscore since
Puppet class names should be alphanumeric + underscore.
That did not take into account '+' such as 'g++'. Add it to the list of
characters to translate to underscore.
irb> 'g++'.tr('-+', '_')
=> "g__"
irb> 'foo-bar++'.tr('-+', '_')
=> "foo_bar__"
Change-Id: Ib5689085620dd3608108b27be3b452cf223516b4
---
M modules/wmflib/lib/puppet/parser/functions/require_package.rb
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/wmflib/lib/puppet/parser/functions/require_package.rb
b/modules/wmflib/lib/puppet/parser/functions/require_package.rb
index 74b9d49..996462f 100644
--- a/modules/wmflib/lib/puppet/parser/functions/require_package.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/require_package.rb
@@ -21,7 +21,9 @@
newfunction(:require_package, :arity => -2) do |args|
Puppet::Parser::Functions.function :create_resources
args.flatten.each do |package_name|
- class_name = 'packages::' + package_name.tr('-', '_')
+ # Puppet class names are alphanumeric + underscore
+ # 'g++' package would yield: 'packages::g__'
+ class_name = 'packages::' + package_name.tr('-+', '_')
# Create host class
--
To view, visit https://gerrit.wikimedia.org/r/290697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5689085620dd3608108b27be3b452cf223516b4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
