[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 c75b2199ca57f4101f1a731fec603f69349c0d5a
Author: James Turnbull <james at lovedthanlost.net>
Date:   Wed Jun 16 03:25:52 2010 +1000

    Fixes #3395 - CR+LF line endings in manifests cause syntax error
    
    Thanks to Alan Barrett for the patch

diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb
index 7adb0b6..cc0b0bc 100644
--- a/lib/puppet/parser/lexer.rb
+++ b/lib/puppet/parser/lexer.rb
@@ -361,7 +361,7 @@ class Puppet::Parser::Lexer
         @file = nil
         # AAARRGGGG! okay, regexes in ruby are bloody annoying
         # no one else has "\n" =~ /\s/
-        @skip = %r{[ \t]+}
+        @skip = %r{[ \t\r]+}
 
         @namestack = []
         @token_queue = []

-- 
Puppet packaging for Debian