making states capable of being the namevar

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@636 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 18 insertions, 1 deletions

diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 4a1afd91d..ca3b83ed7 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -774,7 +774,24 @@ class Type < Puppet::Element
     #---------------------------------------------------------------
     # derive the instance name based on class.namevar
     def name
-        return self[self.class.namevar]
+        unless defined? @name and @name
+            namevar = self.class.namevar
+            if self.class.validparameter?(namevar)
+                @name = @parameters[namevar]
+            elsif self.class.validstate?(namevar)
+                @name = self.should(namevar)
+            else
+                raise Puppet::DevError, "Could not find namevar %s for %s" %
+                    [namevar, self.class.name]
+            end
+        end
+
+        unless @name
+            raise Puppet::DevError, "Could not find name %s for %s" %
+                [namevar, self.class.name]
+        end
+
+        return @name
     end
     #---------------------------------------------------------------