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

test branch puppet-dev at googlegroups.com
Wed Jul 14 10:30:41 UTC 2010


The following commit has been merged in the upstream branch:
commit 2aa579bdbd91db2cd9a154e0ead2b327fa9a8474
Author: Luke Kanies <luke at madstop.com>
Date:   Sun Nov 1 14:58:03 2009 -0500

    Removing a redundant method in Report
    
    Signed-off-by: Luke Kanies <luke at madstop.com>

diff --git a/lib/puppet/transaction/report.rb b/lib/puppet/transaction/report.rb
index 0fb1db0..6d365a5 100644
--- a/lib/puppet/transaction/report.rb
+++ b/lib/puppet/transaction/report.rb
@@ -44,11 +44,6 @@ class Puppet::Transaction::Report
         @metrics[metric.name] = metric
     end
 
-    # Add a new log message.
-    def newlog(msg)
-        @logs << msg
-    end
-
     # Provide a summary of this report.
     def summary
         ret = ""
diff --git a/lib/puppet/util/log/destinations.rb b/lib/puppet/util/log/destinations.rb
index b11aa2b..89f87db 100644
--- a/lib/puppet/util/log/destinations.rb
+++ b/lib/puppet/util/log/destinations.rb
@@ -209,7 +209,7 @@ Puppet::Util::Log.newdesttype :report do
     end
 
     def handle(msg)
-        @report.newlog(msg)
+        @report << msg
     end
 end
 
diff --git a/spec/unit/util/log/destinations.rb b/spec/unit/util/log/destinations.rb
index 0bc416e..b43c757 100755
--- a/spec/unit/util/log/destinations.rb
+++ b/spec/unit/util/log/destinations.rb
@@ -17,7 +17,7 @@ describe Puppet::Util::Log.desttypes[:report] do
         report = mock 'report'
         dest = @dest.new(report)
 
-        report.expects(:newlog).with("my log")
+        report.expects(:<<).with("my log")
 
         dest.handle "my log"
     end

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list