diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-28 14:44:39 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-28 14:44:39 -0600 |
| commit | fe1f4f57bf5ee0792ee645ec8e0bfddf455ea1e3 (patch) | |
| tree | ad62c32acd6fa7fb22a7025866d43eaea688f673 /lib/puppet/node/catalog.rb | |
| parent | dd17d4ca71e17deba8cf19e376e2d711fa516d92 (diff) | |
| parent | c0b5352851d3fdef20b2a432f6f06d31fdc9ce99 (diff) | |
| download | puppet-fe1f4f57bf5ee0792ee645ec8e0bfddf455ea1e3.tar.gz puppet-fe1f4f57bf5ee0792ee645ec8e0bfddf455ea1e3.tar.xz puppet-fe1f4f57bf5ee0792ee645ec8e0bfddf455ea1e3.zip | |
Merge branch '0.24.x' of ssh://reductivelabs.com/opt/rl/git/puppet into 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 |