Update stdlib

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / lib / puppet / parser / functions / ensure_packages.rb

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb
index f1da4aa..1bf8bf1 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb
@@ -11,24 +11,43 @@ third argument to the ensure_resource() function.
   ) do |arguments|
 
     if arguments.size > 2 or arguments.size == 0
-      raise(Puppet::ParseError, "ensure_packages(): Wrong number of arguments " +
-        "given (#{arguments.size} for 1 or 2)")
-    elsif arguments.size == 2 and !arguments[1].is_a?(Hash) 
+      raise(Puppet::ParseError, "ensure_packages(): Wrong number of arguments given (#{arguments.size} for 1 or 2)")
+    elsif arguments.size == 2 and !arguments[1].is_a?(Hash)
       raise(Puppet::ParseError, 'ensure_packages(): Requires second argument to be a Hash')
     end
 
-    packages = Array(arguments[0])
+    if arguments[0].is_a?(Hash)
+      if arguments[1]
+        defaults = { 'ensure' => 'present' }.merge(arguments[1])
+        if defaults['ensure'] == 'installed'
+          defaults['ensure'] = 'present'
+        end
+      else
+        defaults = { 'ensure' => 'present' }
+      end
 
-    if arguments[1]
-      defaults = { 'ensure' => 'present' }.merge(arguments[1])
+      Puppet::Parser::Functions.function(:ensure_resources)
+      function_ensure_resources(['package', arguments[0].dup, defaults ])
     else
-      defaults = { 'ensure' => 'present' }
-    end
+      packages = Array(arguments[0])
+
+      if arguments[1]
+        defaults = { 'ensure' => 'present' }.merge(arguments[1])
+        if defaults['ensure'] == 'installed'
+          defaults['ensure'] = 'present'
+        end
+      else
+        defaults = { 'ensure' => 'present' }
+      end
 
-    Puppet::Parser::Functions.function(:ensure_resource)
-    packages.each { |package_name|
-      function_ensure_resource(['package', package_name, defaults ])
+      Puppet::Parser::Functions.function(:ensure_resource)
+      packages.each { |package_name|
+      raise(Puppet::ParseError, 'ensure_packages(): Empty String provided for package name') if package_name.length == 0
+      if !findresource("Package[#{package_name}]")
+        function_ensure_resource(['package', package_name, defaults ])
+      end
     }
+    end
   end
 end