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

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit 051bd98751d9d4bc97f93f66723d9b7a00c0cfb4
Author: Markus Roberts <Markus at reality.com>
Date:   Fri Jul 9 18:01:34 2010 -0700

    Code smell: Miscellaneous oddity removal
    
    * Changed "string = self[1].gsub(%r((?:\\\\[\\\\bfnrt\"/]|(?:\\\\u(?:[A-Fa-f\\d]{4}))+|\\\\[\\x20-\\xff]))n) do |c|" to "string = self[1].gsub(%r{(?:\\\\[\\\\bfnrt\"/]|(?:\\\\u(?:[A-Fa-f\\d]{4}))+|\\\\[\\x20-\\xff])}n) do |c|" in lib/puppet/external/pson/pure/parser.rb
    
    *
    
    * Changed "\"$\"" to "'$'" in lib/puppet/provider/augeas/augeas.rb

diff --git a/lib/puppet/external/pson/pure/parser.rb b/lib/puppet/external/pson/pure/parser.rb
index 16643ac..56c27f7 100644
--- a/lib/puppet/external/pson/pure/parser.rb
+++ b/lib/puppet/external/pson/pure/parser.rb
@@ -128,7 +128,7 @@ module PSON
       def parse_string
         if scan(STRING)
           return '' if self[1].empty?
-          string = self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do |c|
+          string = self[1].gsub(%r{(?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff])}n) do |c|
             if u = UNESCAPE_MAP[$&[1]]
               u
             else # \uXXXX
diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb
index 5329c0f..3a35c32 100644
--- a/lib/puppet/provider/augeas/augeas.rb
+++ b/lib/puppet/provider/augeas/augeas.rb
@@ -102,7 +102,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
                     # Rip off any ticks if they are there.
                     p = p[1, (p.size - 2)] if p[0,1] == "'" || p[0,1] == "\""
                     p.chomp!("/")
-                    if p[0,1] != "$" && p[0,1] != "/"
+                    if p[0,1] != '$' && p[0,1] != "/"
                         argline << context + p
                     else
                         argline << p

-- 
Puppet packaging for Debian