summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/resource.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/resource.rb b/lib/puppet/resource.rb
index 55874aec8..ca7c212a9 100644
--- a/lib/puppet/resource.rb
+++ b/lib/puppet/resource.rb
@@ -217,7 +217,11 @@ class Puppet::Resource
end
def uniqueness_key
- self.to_hash.values_at(*key_attributes.sort_by { |k| k.to_s })
+ # Temporary kludge to deal with inconsistant use patters
+ h = self.to_hash
+ h[namevar] ||= h[:name]
+ h[:name] ||= h[namevar]
+ h.values_at(*key_attributes.sort_by { |k| k.to_s })
end
def key_attributes