Ori.livneh has submitted this change and it was merged. Change subject: Remove plural-form alias for require_package() ......................................................................
Remove plural-form alias for require_package() Get rid of require_packages(), keeping only require_package(), and making it variadic. (arity -2 means "1 or more arguments"; see <http://rdoc.info/github/puppetlabs/puppet/Puppet/Parser/Functions.newfunction#newfunction-class_method>) Change-Id: I231ad4e5c545a2de563d141d62bbf3b94118a766 --- M modules/wmflib/README.md M modules/wmflib/lib/puppet/parser/functions/require_package.rb 2 files changed, 8 insertions(+), 16 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/wmflib/README.md b/modules/wmflib/README.md index c289720..30a5ea0 100644 --- a/modules/wmflib/README.md +++ b/modules/wmflib/README.md @@ -104,9 +104,9 @@ } -## require_packages +## require_package -`require_packages( string $package_name [, string $... ] )` +`require_package( string $package_name [, string $... ] )` Declare one or more packages a dependency for the current scope. This is equivalent to declaring and requiring the package resources. @@ -119,11 +119,11 @@ require_package('python-redis') # Multiple packages as arguments - require_packages('redis-server', 'python-redis') + require_package('redis-server', 'python-redis') # Multiple packages as array $deps = [ 'redis-server', 'python-redis' ] - require_packages($deps) + require_package($deps) ## requires_realm diff --git a/modules/wmflib/lib/puppet/parser/functions/require_package.rb b/modules/wmflib/lib/puppet/parser/functions/require_package.rb index fe7b405..c818c1c 100644 --- a/modules/wmflib/lib/puppet/parser/functions/require_package.rb +++ b/modules/wmflib/lib/puppet/parser/functions/require_package.rb @@ -1,4 +1,4 @@ -# == Function: require_packages( string $package_name [, string $... ] ) +# == Function: require_package( string $package_name [, string $... ] ) # # Declare one or more packages a dependency for the current scope. # This is equivalent to declaring and requiring the package resources. @@ -11,14 +11,14 @@ # require_package('python-redis') # # # Multiple packages as arguments -# require_packages('redis-server', 'python-redis') +# require_package('redis-server', 'python-redis') # # # Multiple packages as array # $deps = [ 'redis-server', 'python-redis' ] -# require_packages($deps) +# require_package($deps) # module Puppet::Parser::Functions - require_packages = proc do |args| + newfunction(:require_package, :arity => -2) do |args| Puppet::Parser::Functions.function(:create_resources) packages = @compiler.topscope.function_create_resources [ 'package', @@ -28,12 +28,4 @@ resource.set_parameter(:require, resource[:require].to_a | packages) end end - - newfunction :require_package, - :arity => 1, - &require_packages - - newfunction :require_packages, - :arity => -2, - &require_packages end -- To view, visit https://gerrit.wikimedia.org/r/159083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I231ad4e5c545a2de563d141d62bbf3b94118a766 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh <[email protected]> Gerrit-Reviewer: Alexandros Kosiaris <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[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
