diff options
| -rw-r--r-- | lib/puppet/transaction.rb | 5 | ||||
| -rwxr-xr-x | test/other/transactions.rb | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index 5f105b220..4d82d3331 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 f8bdb9f2e..94deeab26 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 |