[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5rc1-120-g2247c80

[Paul Berry]

The following commit has been merged in the upstream branch:
commit 4c9eca1cab3caae8050807fc71b24408fce85e69
Author: Paul Berry <paul at puppetlabs.com>
Date:   Thu Jan 6 10:55:21 2011 -0800

    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.

diff --git a/lib/puppet/resource/status.rb b/lib/puppet/resource/status.rb
index ee83004..a9a6442 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))

-- 
Puppet packaging for Debian