[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit 9d9b20f4e6d4bd3501033d58b0e93411e40a147a
Author: Luke Kanies <luke at reductivelabs.com>
Date:   Tue Mar 23 10:41:15 2010 -0700

    Fixing Configurer interface to transaction report
    
    Signed-off-by: Luke Kanies <luke at reductivelabs.com>

diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb
index 8179d2c..aa336b4 100644
--- a/lib/puppet/configurer.rb
+++ b/lib/puppet/configurer.rb
@@ -194,7 +194,7 @@ class Puppet::Configurer
     end
 
     def send_report(report, trans = nil)
-        trans.add_metrics_to_report(report) if trans
+        trans.generate_report if trans
         puts report.summary if Puppet[:summarize]
         report.save() if Puppet[:report]
     rescue => detail
diff --git a/spec/unit/configurer.rb b/spec/unit/configurer.rb
index 03ef188..9fc46af 100755
--- a/spec/unit/configurer.rb
+++ b/spec/unit/configurer.rb
@@ -236,7 +236,7 @@ describe Puppet::Configurer, "when sending a report" do
     end
 
     it "should use any provided transaction to add metrics to the report" do
-        @trans.expects(:add_metrics_to_report).with(@report)
+        @trans.expects(:generate_report)
         @configurer.send_report(@report, @trans)
     end
 

-- 
Puppet packaging for Debian