Ticket #671: puppet-identify.patch

lib/puppet/parser/interpreter.rb

@@ -217 +217 @@
-        # until we've gotten rid of all of everything or thrown an error.
-        evaliterate(scope)
-
-        # Now make sure we fail if there's anything left to do
-        failonleftovers(scope)
-
-        # Now finish everything.  This recursively calls finish on the
-        # contained scopes and resources.
-        scope.finish
-
+        # Now make sure we fail if there's anything left to do
+        failonleftovers(scope)
+
-        # Store everything.  We need to do this before translation, because
-        # it operates on resources, not transobjects.
-        if Puppet[:storeconfigs]

lib/puppet/parser/ast/resourceoverride.rb

@@ -44 +44 @@
-
-            # Now we tell the scope that it's an override, and it behaves as
-            # necessary.
-
-
-
+
-        end
-
-        # Create our ResourceDef.  Handles type checking for us.

lib/puppet/parser/ast/resourcedef.rb

@@ -112 +112 @@
-                # And then store the resource in the scope.
-                # XXX At some point, we need to switch all of this to return
-                # objects instead of storing them like this.
-
-
+
-            end
-        }.reject { |obj| obj.nil? }
-    end

lib/puppet/parser/resource.rb

@@ -85 +85 @@
-        @ref.builtin = bool
-    end
-
+    def compareparams(other)
+        p1, p2 = self.params, other.params
+        return false if p1.keys != p2.keys
+        p1.each do |k, v|
+            return false if p2[k].value != v.value
+        end
+        return true
+    end
+
-    # Retrieve the associated definition and evaluate it.
-    def evaluate
-        if klass = @ref.definedtype
@@ -132 +141 @@
-        addmetaparams()
-    end
-
+    # Check whether resources are identical.
+    # Everything but source location is taken into account.
+    # Overrides can be identical too.
+    #
+    # Maybe a self.new method should be written, that only creates instances
+    # if no identical instance exists?
+    #
+    def identical(other)
+        return (self.type == other.type and
+                self.title == other.title and
+                self.virtual == other.virtual and
+                self.exported == other.exported and
+                self.override == other.override and
+                self.compareparams(other))
+    end
+
-    def initialize(options)
-        options = symbolize_options(options)
-

lib/puppet/parser/scope.rb

@@ -84 +84 @@
-        end
-    end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                end
+            end
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            end
+
+            if obj.line or obj.file
+                msg << "; cannot redefine"
+            end
+
+            raise Puppet::ParseError.new(msg)
-        end
-
-        return true
-    end
-
-    # Return the scope associated with a class.  This is just here so
@@ -486 +503 @@
-    # Add a new object to our object table and the global list, and do any necessary
-    # checks.
-    def setresource(obj)
-        self.chkobjectclosure(obj)
-
-        @children << obj
-
-        # Mark the resource as virtual or exported, as necessary.
-        if self.exported?
-            obj.exported = true
@@ -497 +510 @@
-            obj.virtual = true
-        end
-
+        orig = self.chkoriginal(obj)
+        return orig if orig
+
+        @children << obj
-        # The global table
-        @definedtable[obj.ref] = obj
-
-        return obj
-    end
-
-
-
-
+
+
-    def setoverride(resource)
-        resource.override = true
-
-    obj.merge
-else
-
-end
+
+orig = self.chkoriginal
+return orig if orig
+
+@overridetable[resource.ref] << resource
-    end
-
-    # Set defaults for a type.  The typename should already be downcased,