Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next

3 files changed, 15 insertions, 4 deletions

diff --git a/lib/puppet/resource.rb b/lib/puppet/resource.rb
index 214516908..0f4e24cc4 100644
--- a/lib/puppet/resource.rb
+++ b/lib/puppet/resource.rb
@@ -243,11 +243,16 @@ class Puppet::Resource
     h = self.to_hash
     h[namevar] ||= h[:name]
     h[:name]   ||= h[namevar]
-    h.values_at(*key_attributes.sort_by { |k| k.to_s })
+    # Simulate the same behaviour like Type#uniqueness_key
+    if key_attributes.size == 1
+      h[namevar]
+    else
+      h.values_at(*key_attributes)
+    end
   end
 
   def key_attributes
-    return(resource_type.respond_to? :key_attributes) ? resource_type.key_attributes : [:name]
+    resource_type.respond_to?(:key_attributes) ? resource_type.key_attributes : [:name]
   end
 
   # Convert our resource to Puppet code.
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index aa650eea1..6c816f130 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -245,7 +245,7 @@ class Puppet::Transaction
     @catalog.vertices.each do |resource|
       if provider = resource.provider and provider.class.respond_to?(:prefetch)
         prefetchers[provider.class] ||= {}
-        prefetchers[provider.class][resource.name] = resource
+        prefetchers[provider.class][resource.uniqueness_key] = resource
       end
     end
 
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 205d809c1..c8d8688b0 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -200,7 +200,13 @@ class Type
   end
 
   def uniqueness_key
-    to_resource.uniqueness_key
+    # If we have only one namevar use that one (res.uniqueness_key behaves
+    # like res[:name] in that case). Otherwise use an array of all keyattributes
+    if name_var
+      self[:name]
+    else
+      @parameters.values_at(*self.class.key_attributes).collect {|p| p.value }
+    end
   end
 
   # Create a new parameter.  Requires a block and a name, stores it in the