summaryrefslogtreecommitdiffstats
path: root/lib/puppet/node/catalog.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/node/catalog.rb')
-rw-r--r--lib/puppet/node/catalog.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb
index ee4cedd4b..d680de9a0 100644
--- a/lib/puppet/node/catalog.rb
+++ b/lib/puppet/node/catalog.rb
@@ -1,4 +1,6 @@
require 'puppet/indirector'
+require 'puppet/pgraph'
+require 'puppet/transaction'
require 'puppet/util/tagging'
@@ -69,7 +71,10 @@ class Puppet::Node::Catalog < Puppet::PGraph
@resource_table[ref] = resource
# 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
+ #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?
+ end
resource.catalog = self if resource.respond_to?(:catalog=) and ! is_relationship_graph
@@ -499,7 +504,7 @@ class Puppet::Node::Catalog < Puppet::PGraph
map.clear
- result.add_class *self.classes
+ result.add_class(*self.classes)
result.tag(*self.tags)
return result