[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit 30f49bb28fd0b2bb771ed3fa75a2d70dbda361f3
Author: Markus Roberts <Markus at reality.com>
Date:   Mon Nov 23 10:03:47 2009 -0800

    Resolving conflicts with ???
    
    Brice's hash implementation introduces new occurances of SQTEXT/DQTEXT which, with
    string interpolation, should simply be STRING.

diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 79bc2b0..1e8a399 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -822,9 +822,8 @@ hashpair:   key FARROW rvalue {
     result = ast AST::ASTHash, { :value => { val[0] => val[2] } }
 }
 
-key: NAME { result = val[0][:value] }
-        | SQTEXT { result = val[0][:value] }
-        | DQTEXT { result = val[0][:value] }
+key:   NAME { result = val[0][:value] }
+   | STRING { result = val[0][:value] }
 
 hasharrayaccess: VARIABLE LBRACK rvalue RBRACK {
     result = ast AST::HashOrArrayAccess, :variable => val[0][:value], :key => val[2] 

-- 
Puppet packaging for Debian