[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5-303-gfcfa26a

[Jacob Helwig]

The following commit has been merged in the upstream branch:
commit 983c2420d47c83922a4417ec2b85af0740468029
Merge: 7e611714c56e3e28ff2077a024498acd26da0604 30fa41ddc3796e62a5bd1d0cf5116e14323992a3
Author: Jacob Helwig <jacob at puppetlabs.com>
Date:   Mon Feb 21 14:41:12 2011 -0800

    Merge branch '2.6.x' into 2.6.next
    
    * 2.6.x:
      Updated CHANGELOG for 2.6.5rc5
      (#6337) Fix Ruby warning on 1.8.6 about "future compatibility"
      (#6353) Restore the ability to store paths in the filebucket
      (#6126) Puppet inspect now reports status after run completes.

diff --combined lib/puppet/application/inspect.rb
index 9e2aaed,764c8c4..ce32c66
--- a/lib/puppet/application/inspect.rb
+++ b/lib/puppet/application/inspect.rb
@@@ -82,7 -82,7 +82,7 @@@ Licensed under the GNU General Public L
      Puppet::Util::Log.newdestination(@report)
      Puppet::Util::Log.newdestination(:console) unless options[:logset]
  
 -    trap(:INT) do
 +    Signal.trap(:INT) do
        $stderr.puts "Exiting"
        exit(1)
      end
@@@ -98,79 -98,81 +98,81 @@@
    end
  
    def run_command
-     retrieval_starttime = Time.now
+     benchmark(:notice, "Finished inspection") do
+       retrieval_starttime = Time.now
  
-     unless catalog = Puppet::Resource::Catalog.find(Puppet[:certname])
-       raise "Could not find catalog for #{Puppet[:certname]}"
-     end
+       unless catalog = Puppet::Resource::Catalog.find(Puppet[:certname])
+         raise "Could not find catalog for #{Puppet[:certname]}"
+       end
  
-     @report.configuration_version = catalog.version
+       @report.configuration_version = catalog.version
  
-     inspect_starttime = Time.now
-     @report.add_times("config_retrieval", inspect_starttime - retrieval_starttime)
+       inspect_starttime = Time.now
+       @report.add_times("config_retrieval", inspect_starttime - retrieval_starttime)
  
-     if Puppet[:archive_files]
-       dipper = Puppet::FileBucket::Dipper.new(:Server => Puppet[:archive_file_server])
-     end
+       if Puppet[:archive_files]
+         dipper = Puppet::FileBucket::Dipper.new(:Server => Puppet[:archive_file_server])
+       end
  
-     catalog.to_ral.resources.each do |ral_resource|
-       audited_attributes = ral_resource[:audit]
-       next unless audited_attributes
+       catalog.to_ral.resources.each do |ral_resource|
+         audited_attributes = ral_resource[:audit]
+         next unless audited_attributes
  
-       status = Puppet::Resource::Status.new(ral_resource)
+         status = Puppet::Resource::Status.new(ral_resource)
  
-       begin
-         audited_resource = ral_resource.to_resource
-       rescue StandardError => detail
-         puts detail.backtrace if Puppet[:trace]
-         ral_resource.err "Could not inspect #{ral_resource}; skipping: #{detail}"
-         audited_attributes.each do |name|
-           event = ral_resource.event(
-             :property => name,
-             :status   => "failure",
-             :audited  => true,
-             :message  => "failed to inspect #{name}"
-           )
-           status.add_event(event)
-         end
-       else
-         audited_attributes.each do |name|
-           next if audited_resource[name].nil?
-           # Skip :absent properties of :absent resources. Really, it would be nicer if the RAL returned nil for those, but it doesn't. ~JW
-           if name == :ensure or audited_resource[:ensure] != :absent or audited_resource[name] != :absent
+         begin
+           audited_resource = ral_resource.to_resource
+         rescue StandardError => detail
+           puts detail.backtrace if Puppet[:trace]
+           ral_resource.err "Could not inspect #{ral_resource}; skipping: #{detail}"
+           audited_attributes.each do |name|
              event = ral_resource.event(
-               :previous_value => audited_resource[name],
-               :property       => name,
-               :status         => "audit",
-               :audited        => true,
-               :message        => "inspected value is #{audited_resource[name].inspect}"
-             )
+                                        :property => name,
+                                        :status   => "failure",
+                                        :audited  => true,
+                                        :message  => "failed to inspect #{name}"
+                                        )
              status.add_event(event)
            end
+         else
+           audited_attributes.each do |name|
+             next if audited_resource[name].nil?
+             # Skip :absent properties of :absent resources. Really, it would be nicer if the RAL returned nil for those, but it doesn't. ~JW
+             if name == :ensure or audited_resource[:ensure] != :absent or audited_resource[name] != :absent
+               event = ral_resource.event(
+                                          :previous_value => audited_resource[name],
+                                          :property       => name,
+                                          :status         => "audit",
+                                          :audited        => true,
+                                          :message        => "inspected value is #{audited_resource[name].inspect}"
+                                          )
+               status.add_event(event)
+             end
+           end
          end
-       end
-       if Puppet[:archive_files] and ral_resource.type == :file and audited_attributes.include?(:content)
-         path = ral_resource[:path]
-         if File.readable?(path)
-           begin
-             dipper.backup(path)
-           rescue StandardError => detail
-             Puppet.warning detail
+         if Puppet[:archive_files] and ral_resource.type == :file and audited_attributes.include?(:content)
+           path = ral_resource[:path]
+           if File.readable?(path)
+             begin
+               dipper.backup(path)
+             rescue StandardError => detail
+               Puppet.warning detail
+             end
            end
          end
+         @report.add_resource_status(status)
        end
-       @report.add_resource_status(status)
-     end
  
-     finishtime = Time.now
-     @report.add_times("inspect", finishtime - inspect_starttime)
-     @report.finalize_report
+       finishtime = Time.now
+       @report.add_times("inspect", finishtime - inspect_starttime)
+       @report.finalize_report
  
-     begin
-       @report.save
-     rescue => detail
-       puts detail.backtrace if Puppet[:trace]
-       Puppet.err "Could not send report: #{detail}"
+       begin
+         @report.save
+       rescue => detail
+         puts detail.backtrace if Puppet[:trace]
+         Puppet.err "Could not send report: #{detail}"
+       end
      end
    end
  end

-- 
Puppet packaging for Debian