diff options
| author | Luke Kanies <luke@madstop.com> | 2008-05-25 16:00:48 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-05-25 16:00:48 -0500 |
| commit | 29f5f1b862112179ce1b77ae0177811ab2208aeb (patch) | |
| tree | 5938a8df29fd6cf8182f6e12f28956ebeff2732c /lib/puppet/node | |
| parent | fe157f239a301abb52f81c62719355c8e50c970c (diff) | |
| parent | 7b02f2ba443ba35d7305c24b87028456eaf6bd29 (diff) | |
| download | puppet-29f5f1b862112179ce1b77ae0177811ab2208aeb.tar.gz puppet-29f5f1b862112179ce1b77ae0177811ab2208aeb.tar.xz puppet-29f5f1b862112179ce1b77ae0177811ab2208aeb.zip | |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
lib/puppet/transaction.rb
Diffstat (limited to 'lib/puppet/node')
| -rw-r--r-- | lib/puppet/node/catalog.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb index c5e32a032..3ac11a66d 100644 --- a/lib/puppet/node/catalog.rb +++ b/lib/puppet/node/catalog.rb @@ -483,6 +483,9 @@ class Puppet::Node::Catalog < Puppet::PGraph if resource.is_a?(Puppet::TransObject) resource = resource.dup resource.catalog = result + elsif resource.is_a?(Puppet::Parser::Resource) + resource = resource.to_transobject + resource.catalog = result end newres = resource.send(convert) |