diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-03-30 16:09:41 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-03-30 16:09:41 -0700 |
| commit | d7a1424fa9b4626a2faa96d4673308ff91e5deb8 (patch) | |
| tree | 2b665df75921ddc6794d5959ccd847a1d6ae5373 /lib | |
| parent | 9d17809e5b240aa80d2c30f4d9625d4812802b8f (diff) | |
| parent | 87ca3130c570df65ab1296cc18de697afa6a55f5 (diff) | |
| download | puppet-d7a1424fa9b4626a2faa96d4673308ff91e5deb8.tar.gz puppet-d7a1424fa9b4626a2faa96d4673308ff91e5deb8.tar.xz puppet-d7a1424fa9b4626a2faa96d4673308ff91e5deb8.zip | |
Merge branch 'ticket/2.6.next/5670' into 2.6.next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/transaction.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index aa650eea1..48154ad6f 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -47,7 +47,7 @@ class Puppet::Transaction def apply(resource, ancestor = nil) status = resource_harness.evaluate(resource) add_resource_status(status) - event_manager.queue_events(ancestor || resource, status.events) + event_manager.queue_events(ancestor || resource, status.events) unless status.failed? rescue => detail resource.err "Could not evaluate: #{detail}" end |