summaryrefslogtreecommitdiffstats
path: root/lib/puppet/transaction.rb
diff options
context:
space:
mode:
authorballman <ballman@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-09 01:51:20 +0000
committerballman <ballman@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-09 01:51:20 +0000
commitc1643600e1130e2ddd112abcf16bb040fbffe0bf (patch)
tree73db9055495e529b0cac11ba8e81eb910db1e6a5 /lib/puppet/transaction.rb
parent8f187461a357898395ded25fb0c29a0d90a76896 (diff)
downloadpuppet-c1643600e1130e2ddd112abcf16bb040fbffe0bf.tar.gz
puppet-c1643600e1130e2ddd112abcf16bb040fbffe0bf.tar.xz
puppet-c1643600e1130e2ddd112abcf16bb040fbffe0bf.zip
Merging of refactor-transacton to the trunk. This work removes the :is attribute from properties and relies on the provider to cache or return the current value of the property.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2487 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/transaction.rb')
-rw-r--r--lib/puppet/transaction.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 75332c145..a276d138c 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -107,7 +107,7 @@ class Transaction
puts detail.backtrace
end
change.property.err "change from %s to %s failed: %s" %
- [change.property.is_to_s, change.property.should_to_s, detail]
+ [change.property.is_to_s(change.is), change.property.should_to_s(change.should), detail]
@failures[resource] += 1
next
# FIXME this should support using onerror to determine