diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-05-23 00:51:22 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-05-23 00:51:22 +1000 |
| commit | 3f35afa802ecc87e34b44f5b23d76621ab145722 (patch) | |
| tree | 53d9e7fc9253b556cbed3b1fe682d7f5420e85ee /lib | |
| parent | d54338f8921b4b2973dcde52576d7e9fa58148cb (diff) | |
| parent | c370104f7efa6231af05df17ccbb03cbaa2e48ab (diff) | |
| download | puppet-3f35afa802ecc87e34b44f5b23d76621ab145722.tar.gz puppet-3f35afa802ecc87e34b44f5b23d76621ab145722.tar.xz puppet-3f35afa802ecc87e34b44f5b23d76621ab145722.zip | |
Merge branch '0.24.x' of git://github.com/lak/puppet into 0.24.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/node/catalog.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb index ecda472be..c4d697244 100644 --- a/lib/puppet/node/catalog.rb +++ b/lib/puppet/node/catalog.rb @@ -483,6 +483,10 @@ 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 + p resource + resource.catalog = result end newres = resource.send(convert) |