summaryrefslogtreecommitdiffstats
path: root/lib/puppet/transaction
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2011-03-28 15:54:28 -0700
committerMatt Robinson <matt@puppetlabs.com>2011-03-29 11:00:38 -0700
commit5e9dfdcec4a3579e8d88a243b608c280c494c3be (patch)
treedda19d4c3ee1dae80310aa1d5808903e2df9e381 /lib/puppet/transaction
parent893817f763131b62778a54378f3897cadf50bd45 (diff)
downloadpuppet-5e9dfdcec4a3579e8d88a243b608c280c494c3be.tar.gz
puppet-5e9dfdcec4a3579e8d88a243b608c280c494c3be.tar.xz
puppet-5e9dfdcec4a3579e8d88a243b608c280c494c3be.zip
(#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@puppetlabs.com>
Diffstat (limited to 'lib/puppet/transaction')
-rw-r--r--lib/puppet/transaction/event.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/transaction/event.rb b/lib/puppet/transaction/event.rb
index cd695cff8..d3f25b71c 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