defining $name in each component scope, and adding test case

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

1 files changed, 22 insertions, 20 deletions

diff --git a/lib/puppet/parser/ast.rb b/lib/puppet/parser/ast.rb
index 38daf42e0..3c3d3bde7 100644
--- a/lib/puppet/parser/ast.rb
+++ b/lib/puppet/parser/ast.rb
@@ -1280,28 +1280,30 @@ module Puppet
                                 end
                             end
                         }
-
-                        hash.each { |arg,value|
-                            begin
-                                scope.setvar(arg,hash[arg])
-                            rescue Puppet::ParseError => except
-                                except.line = self.line
-                                except.file = self.file
-                                raise except
-                            rescue Puppet::ParseError => except
-                                except.line = self.line
-                                except.file = self.file
-                                raise except
-                            rescue => except
-                                error = Puppet::ParseError.new(except.message)
-                                error.line = self.line
-                                error.file = self.file
-                                error.stack = caller
-                                raise error
-                            end
-                        }
                     end
 
+                    #Puppet.warning objname
+                    hash["name"] = objname
+                    hash.each { |arg,value|
+                        begin
+                            scope.setvar(arg,hash[arg])
+                        rescue Puppet::ParseError => except
+                            except.line = self.line
+                            except.file = self.file
+                            raise except
+                        rescue Puppet::ParseError => except
+                            except.line = self.line
+                            except.file = self.file
+                            raise except
+                        rescue => except
+                            error = Puppet::ParseError.new(except.message)
+                            error.line = self.line
+                            error.file = self.file
+                            error.stack = caller
+                            raise error
+                        end
+                    }
+
                     # now just evaluate the code with our new bindings
                     self.code.evaluate(scope)
                 end