summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Berry <paul@puppetlabs.com>2011-01-06 10:55:21 -0800
committerPaul Berry <paul@puppetlabs.com>2011-01-06 10:55:21 -0800
commit4c9eca1cab3caae8050807fc71b24408fce85e69 (patch)
treed879e04f9985f754d6f27efb2a7e2ae4e028ebc9
parent83ac3e789ddc8dbf40c93460032474870fb16c54 (diff)
downloadpuppet-4c9eca1cab3caae8050807fc71b24408fce85e69.tar.gz
puppet-4c9eca1cab3caae8050807fc71b24408fce85e69.tar.xz
puppet-4c9eca1cab3caae8050807fc71b24408fce85e69.zip
Maint: Added "skipped" to the YAML output for Puppet::Resource::Status
In 2.6.4 and earlier, "skipped" appeared only when true. A recent change accidentally caused it to never appear. This change makes it always appear.
-rw-r--r--lib/puppet/resource/status.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/resource/status.rb b/lib/puppet/resource/status.rb
index ee83004bb..a9a64425e 100644
--- a/lib/puppet/resource/status.rb
+++ b/lib/puppet/resource/status.rb
@@ -12,7 +12,7 @@ module Puppet
attr_reader :source_description, :default_log_level, :time, :resource
attr_reader :change_count, :out_of_sync_count, :resource_type, :title
- YAML_ATTRIBUTES = %w{@resource @file @line @evaluation_time @change_count @out_of_sync_count @tags @time @events @out_of_sync @changed @resource_type @title}
+ YAML_ATTRIBUTES = %w{@resource @file @line @evaluation_time @change_count @out_of_sync_count @tags @time @events @out_of_sync @changed @resource_type @title @skipped}
# Provide a boolean method for each of the states.
STATES.each do |attr|
@@ -51,6 +51,7 @@ module Puppet
@out_of_sync_count = 0
@changed = false
@out_of_sync = false
+ @skipped = false
[:file, :line].each do |attr|
send(attr.to_s + "=", resource.send(attr))