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

[Paul Berry]

The following commit has been merged in the experimental branch:
commit 32dcb31a7a371ea542bf3c733d3d775ef3a8e51d
Author: Paul Berry <paul at puppetlabs.com>
Date:   Mon Nov 22 11:27:37 2010 -0800

    (#5370) Made metrics and --summarize work with Puppet apply
    
    Puppet apply and Puppet agent use different code paths to run the
    transaction.  In the code path for Puppet apply, we weren't passing
    the report to catalog.apply, and as a result catalog.apply was
    creating its own report to store metrics in; this report was then
    discarded.  As a result, reports generated using "puppet apply" had no
    metrics, and the "--summarize" option didn't work at all.
    
    Fixed by modifying the "puppet apply" code path to pass the report to
    catalog.apply.  In the future it would be nice to refactor the two
    code paths to be the same.
    
    Paired-with: Jesse Wolfe <jesse at puppetlabs.com>

diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
index 59a95d3..f6299f9 100644
--- a/lib/puppet/application/apply.rb
+++ b/lib/puppet/application/apply.rb
@@ -130,7 +130,7 @@ class Puppet::Application::Apply < Puppet::Application
         report = configurer.initialize_report
         Puppet::Util::Log.newdestination(report)
       end
-      transaction = catalog.apply
+      transaction = catalog.apply(:report => report)
 
       configurer.execute_postrun_command
 

-- 
Puppet packaging for Debian