[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.4-89-gcbbd363

James Turnbull james at lovedthanlost.net
Tue May 18 09:04:29 UTC 2010


The following commit has been merged in the upstream branch:
commit f0e12e521742ade60f8901cd1e5317b2d3d81cc3
Author: James Turnbull <james at lovedthanlost.net>
Date:   Mon Apr 5 16:23:11 2010 +1000

    Fix #3496 - suppress transaction debug message
    
    Fix via Brice Figureau

diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 53b1c51..028bdb8 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -215,7 +215,7 @@ class Transaction
         # Collect the targets of any subscriptions to those events.  We pass
         # the parent resource in so it will override the source in the events,
         # since eval_generated children can't have direct relationships.
-        Puppet::Util.benchmark(:debug, "Time for triggering #{events.size} events to edges") do
+        duration = thinmark do
             b = relationship_graph.matching_edges(events, resource)
             b.each do |orig_edge|
                 # We have to dup the label here, else we modify the original edge label,
@@ -226,6 +226,8 @@ class Transaction
                 set_trigger(edge)
             end
         end
+        Puppet.debug("Time for triggering #{events.size} events to edges: #{duration}") if events.size > 0 and duration > 0
+
         # And return the events for collection
         events
     end

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list