diff options
author | Luke Kanies <luke@madstop.com> | 2008-03-05 12:30:45 -0600 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2008-03-05 12:30:45 -0600 |
commit | c2b33acd5c1e6fe4021d7609f806b7bd8af834f8 (patch) | |
tree | c2c725a171d02d1ac304547d23716b9524beaabf /lib/puppet/node/catalog.rb | |
parent | 93a2189ef7c31bd31821eddc87f91b02b7f5a233 (diff) | |
parent | 443db2009d0f5033eb51ebd210af2a198572fad0 (diff) | |
download | puppet-c2b33acd5c1e6fe4021d7609f806b7bd8af834f8.tar.gz puppet-c2b33acd5c1e6fe4021d7609f806b7bd8af834f8.tar.xz puppet-c2b33acd5c1e6fe4021d7609f806b7bd8af834f8.zip |
Merge branch '0.24.x'
Diffstat (limited to 'lib/puppet/node/catalog.rb')
-rw-r--r-- | lib/puppet/node/catalog.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb index d680de9a0..f885a41ee 100644 --- a/lib/puppet/node/catalog.rb +++ b/lib/puppet/node/catalog.rb @@ -73,7 +73,7 @@ class Puppet::Node::Catalog < Puppet::PGraph # If the name and title differ, set up an alias #self.alias(resource, resource.name) if resource.respond_to?(:name) and resource.respond_to?(:title) and resource.name != resource.title if resource.respond_to?(:name) and resource.respond_to?(:title) and resource.name != resource.title - self.alias(resource, resource.name) if resource.class.isomorphic? + self.alias(resource, resource.name) if resource.isomorphic? end resource.catalog = self if resource.respond_to?(:catalog=) and ! is_relationship_graph |