Making the language name a real alias. Now all objects in Puppet support specifying both the name and the namevar, or just a name and having the namevar set.

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

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/puppet/parser/ast/objectdef.rb b/lib/puppet/parser/ast/objectdef.rb
index 8b40bda71..cf1525540 100644
--- a/lib/puppet/parser/ast/objectdef.rb
+++ b/lib/puppet/parser/ast/objectdef.rb
@@ -21,10 +21,10 @@ class Puppet::Parser::AST
             when Puppet::Type:
                 raise Puppet::Error,
                     "Built-in types must be provided with a name"
-            when HostClass:
+            when Node:
                 return type
             else
-                Puppet.info "Autogenerating name for object of type %s" %
+                Puppet.debug "Autogenerating name for object of type %s" %
                     type
                 return [type, "-", self.object_id].join("")
             end
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb
index 3e88490e3..d05ccac03 100644
--- a/lib/puppet/parser/scope.rb
+++ b/lib/puppet/parser/scope.rb
@@ -727,6 +727,7 @@ module Puppet
                 if defined? @name
                     bucket = TransBucket.new
                     bucket.name = @name
+                    bucket.autoname = self.autoname
 
                     # it'd be nice not to have to do this...
                     results.each { |result|