diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-04-05 15:50:19 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 17bccb0ff3c340116cc17a83fda7b2747d2c93ae (patch) | |
| tree | 8f9e1065e24df11b7169932cacd8adf034092ace /lib | |
| parent | 8465cd08d0e522c8ef871df7d3a5bf216e1d7d59 (diff) | |
| download | puppet-17bccb0ff3c340116cc17a83fda7b2747d2c93ae.tar.gz puppet-17bccb0ff3c340116cc17a83fda7b2747d2c93ae.tar.xz puppet-17bccb0ff3c340116cc17a83fda7b2747d2c93ae.zip | |
Restore noop non-behaviours
In the #2759 series, noop was altering the synced timestamp and calling
the flush() method on nooped resources. This patch prevents those things
from happening.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/transaction/resource_harness.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/transaction/resource_harness.rb b/lib/puppet/transaction/resource_harness.rb index 081e3b10e..2a475a070 100644 --- a/lib/puppet/transaction/resource_harness.rb +++ b/lib/puppet/transaction/resource_harness.rb @@ -51,8 +51,10 @@ class Puppet::Transaction::ResourceHarness status.out_of_sync = true status.change_count = changes.length apply_changes(status, changes) - resource.cache(:synced, Time.now) - resource.flush if resource.respond_to?(:flush) + if ! resource.noop? + resource.cache(:synced, Time.now) + resource.flush if resource.respond_to?(:flush) + end end return status rescue => detail |