From 9afc67a465f030a2a1cad0e7ec58e30862f28b4d Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Mon, 28 Jun 2010 12:00:55 -0700 Subject: Fix for pre 1.8.7 compatibility in namvar patch There was a subtle 1.8.7 dependence in the composite key / namevar patch; Nick discovered that our assumtion that hashes could be used as hash keys does not hold in earlier bersions of ruby. This patch replaces the hash valued uniqueness_key with an array of the values of the (ordered) key attributes. --- lib/puppet/resource.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lib/puppet/resource.rb') diff --git a/lib/puppet/resource.rb b/lib/puppet/resource.rb index 6ffaa2f3b..393211e09 100644 --- a/lib/puppet/resource.rb +++ b/lib/puppet/resource.rb @@ -213,11 +213,7 @@ class Puppet::Resource end def uniqueness_key - h = {} - key_attributes.each do |attribute| - h[attribute] = self.to_hash[attribute] - end - return h + self.to_hash.values_at(*key_attributes.sort_by { |k| k.to_s }) end def key_attributes -- cgit