[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1456-g2f0b1e5

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 5c2ba479d17b6a88fa018947de0b00d16d531220
Author: Steven Jenkins <steven at endpoint.com>
Date:   Fri Sep 18 14:15:32 2009 -0400

    FIXES 2616: Remove sync.syncronize and Puppet.info

diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb
index 4fdaa51..5b4a38e 100644
--- a/lib/puppet/reports/tagmail.rb
+++ b/lib/puppet/reports/tagmail.rb
@@ -128,7 +128,6 @@ Puppet::Reports.register_report(:tagmail) do
                 begin
                     Net::SMTP.start(Puppet[:smtpserver]) do |smtp|
                         reports.each do |emails, messages|
-                            Puppet.info "Sending report to %s" % emails.join(", ")
                             smtp.open_message_stream(Puppet[:reportfrom], *emails) do |p|
                               p.puts "From: #{Puppet[:reportfrom]}"
                               p.puts "Subject: Puppet Report for %s" % self.host
@@ -149,16 +148,13 @@ Puppet::Reports.register_report(:tagmail) do
             elsif Puppet[:sendmail] != ""
                 begin
                     reports.each do |emails, messages|
-                        Puppet.info "Sending report to %s" % emails.join(", ")
                         # We need to open a separate process for every set of email addresses
-                        sync.synchronize do
-                            IO.popen(Puppet[:sendmail] + " " + emails.join(" "), "w") do |p|
-                                p.puts "From: #{Puppet[:reportfrom]}"
-                                p.puts "Subject: Puppet Report for %s" % self.host
-                                p.puts "To: " + emails.join(", ")
+                        IO.popen(Puppet[:sendmail] + " " + emails.join(" "), "w") do |p|
+                            p.puts "From: #{Puppet[:reportfrom]}"
+                            p.puts "Subject: Puppet Report for %s" % self.host
+                            p.puts "To: " + emails.join(", ")
 
-                                p.puts messages
-                            end
+                            p.puts messages
                         end
                     end
                 rescue => detail
@@ -176,12 +172,5 @@ Puppet::Reports.register_report(:tagmail) do
         # Don't bother waiting for the pid to return.
         Process.detach(pid)
     end
-
-    def sync
-        unless defined?(@sync)
-            @sync = Sync.new
-        end
-        @sync
-    end
 end
 

-- 
Puppet packaging for Debian