[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 796d882a657565ebb41b7e366751e59b93fc9614
Author: Luke Kanies <luke at madstop.com>
Date:   Sat Nov 7 18:00:31 2009 -0600

    Removing last event collection transaction code
    
    Signed-off-by: Luke Kanies <luke at madstop.com>

diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 7e478ab..dd28b55 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -209,21 +209,26 @@ class Puppet::Transaction
 
         Puppet.info "Applying configuration version '%s'" % catalog.version if catalog.version
 
-        allevents = @sorted_resources.collect { |resource|
-            if resource.is_a?(Puppet::Type::Component)
-                Puppet.warning "Somehow left a component in the relationship graph"
-                next
-            end
-            ret = nil
-            seconds = thinmark do
-                ret = eval_resource(resource)
-            end
+        begin
+            @sorted_resources.each do |resource|
+                if resource.is_a?(Puppet::Type::Component)
+                    Puppet.warning "Somehow left a component in the relationship graph"
+                    next
+                end
+                ret = nil
+                seconds = thinmark do
+                    ret = eval_resource(resource)
+                end
 
-            if Puppet[:evaltrace] and @catalog.host_config?
-                resource.info "Evaluated in %0.2f seconds" % seconds
+                if Puppet[:evaltrace] and @catalog.host_config?
+                    resource.info "Evaluated in %0.2f seconds" % seconds
+                end
+                ret
             end
-            ret
-        }.flatten.reject { |e| e.nil? }
+        ensure
+            # And then close the transaction log.
+            Puppet::Util::Log.close(@report)
+        end
 
         Puppet.debug "Finishing transaction #{object_id} with #{@changes.length} changes"
     end

-- 
Puppet packaging for Debian