[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 bfb1fa5ebc366e29a47308729854cff49082ee51
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Thu Apr 8 01:30:20 2010 -0700

    Allow skipped resources to process events

diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 5f105b2..4d82d33 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -90,11 +90,10 @@ class Puppet::Transaction
     def eval_resource(resource, ancestor = nil)
         if skip?(resource)
             resource_status(resource).skipped = true
-            return
+        else
+            eval_children_and_apply_resource(resource, ancestor)
         end
 
-        eval_children_and_apply_resource(resource, ancestor)
-
         # Check to see if there are any events queued for this resource
         event_manager.process_events(resource)
     end
diff --git a/test/other/transactions.rb b/test/other/transactions.rb
index f8bdb9f..94deeab 100755
--- a/test/other/transactions.rb
+++ b/test/other/transactions.rb
@@ -396,7 +396,7 @@ class TestTransactions < Test::Unit::TestCase
 
         assert(! file.insync?(file.retrieve), "Uh, file is in sync?")
 
-        assert_events([:file_changed, :triggered], config)
+        assert_events([:content_changed, :restarted], config)
         assert(FileTest.exists?(fname), "File did not get recreated")
     end
 

-- 
Puppet packaging for Debian