[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

Matt Robinson matt at puppetlabs.com
Tue May 10 08:09:15 UTC 2011


The following commit has been merged in the experimental branch:
commit 5e9dfdcec4a3579e8d88a243b608c280c494c3be
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Mon Mar 28 15:54:28 2011 -0700

    (#6830) Fix instance_variables now comes back as symbols
    
    YAML_ATTRIBUTES was being declared as strings and then intersected with
    the list of instance_variables, which in Ruby 1.9 comes back as symbols,
    so results in an empty list every time.
    
    Reviewed-by: Jesse Wolfe <jesse at puppetlabs.com>

diff --git a/lib/puppet/transaction/event.rb b/lib/puppet/transaction/event.rb
index cd695cf..d3f25b7 100644
--- a/lib/puppet/transaction/event.rb
+++ b/lib/puppet/transaction/event.rb
@@ -48,7 +48,7 @@ class Puppet::Transaction::Event
   end
 
   def to_yaml_properties
-    (YAML_ATTRIBUTES & instance_variables).sort
+    (YAML_ATTRIBUTES.map {|ya| ya.to_s} & instance_variables.map{|iv| iv.to_s}).sort
   end
 
   private

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list