diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-04-08 01:30:20 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | bfb1fa5ebc366e29a47308729854cff49082ee51 (patch) | |
| tree | 2e1d205ae0793d37f51b7b9506166fc9b10cef08 | |
| parent | a18b05d846dd8d8787cb0935160a5ee9a64095c2 (diff) | |
| download | puppet-bfb1fa5ebc366e29a47308729854cff49082ee51.tar.gz puppet-bfb1fa5ebc366e29a47308729854cff49082ee51.tar.xz puppet-bfb1fa5ebc366e29a47308729854cff49082ee51.zip | |
Allow skipped resources to process events
| -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 |