diff options
| author | Luke Kanies <luke@madstop.com> | 2008-03-06 15:02:38 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-03-06 15:02:38 -0600 |
| commit | 77fe8990072c8d068aabd5958d14382e21be8860 (patch) | |
| tree | 35365b21989bd85bbbcb227c666a63d05c378ef0 /lib/puppet/node | |
| parent | dade15302f899b75426b6e32dd4b1aa2371bf4fc (diff) | |
| parent | 4c0f6c8502a0759519877f3e933e44ba980f7da2 (diff) | |
| download | puppet-77fe8990072c8d068aabd5958d14382e21be8860.tar.gz puppet-77fe8990072c8d068aabd5958d14382e21be8860.tar.xz puppet-77fe8990072c8d068aabd5958d14382e21be8860.zip | |
Merge commit 'andrew/0.24.x' into 0.24.x
Diffstat (limited to 'lib/puppet/node')
| -rw-r--r-- | lib/puppet/node/catalog.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb index f885a41ee..ecda472be 100644 --- a/lib/puppet/node/catalog.rb +++ b/lib/puppet/node/catalog.rb @@ -84,6 +84,7 @@ class Puppet::Node::Catalog < Puppet::PGraph # Create an alias for a resource. def alias(resource, name) + #set $1 resource.ref =~ /^(.+)\[/ newref = "%s[%s]" % [$1 || resource.class.name, name] @@ -475,6 +476,15 @@ class Puppet::Node::Catalog < Puppet::PGraph vertices.each do |resource| next if resource.respond_to?(:virtual?) and resource.virtual? + #This is hackity hack for 1094 + #Aliases aren't working in the ral catalog because the current instance of the resource + #has a reference to the catalog being converted. . . So, give it a reference to the new one + #problem solved. . . + if resource.is_a?(Puppet::TransObject) + resource = resource.dup + resource.catalog = result + end + newres = resource.send(convert) # We can't guarantee that resources don't munge their names |