Converting the Compile class to use a Node::Catalog instance

as its resource container, instead of having its own behaviour
around resource uniqueness.

1 files changed, 25 insertions, 1 deletions

diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb
index 9601309d8..03187cc94 100644
--- a/lib/puppet/node/catalog.rb
+++ b/lib/puppet/node/catalog.rb
@@ -64,7 +64,7 @@ class Puppet::Node::Catalog < Puppet::PGraph
             else
                 @resource_table[ref] = resource
             end
-            resource.catalog = self unless is_relationship_graph
+            resource.catalog = self if resource.respond_to?(:catalog=) and ! is_relationship_graph
             add_vertex!(resource)
         end
     end
@@ -491,4 +491,28 @@ class Puppet::Node::Catalog < Puppet::PGraph
 
         return result
     end
+
+    # Verify that the given resource isn't defined elsewhere.
+    def verify_resource_uniqueness(resource)
+        # Short-curcuit the common case, 
+        unless existing_resource = @resource_table[resource.ref]
+            return true
+        end
+
+        # Either it's a defined type, which are never
+        # isomorphic, or it's a non-isomorphic type, so
+        # we should throw an exception.
+        msg = "Duplicate definition: %s is already defined" % resource.ref
+
+        if existing_resource.file and existing_resource.line
+            msg << " in file %s at line %s" %
+                [existing_resource.file, existing_resource.line]
+        end
+
+        if resource.line or resource.file
+            msg << "; cannot redefine"
+        end
+
+        raise Puppet::ParseError.new(msg)
+    end
 end