diff options
| author | James Turnbull <james@lovedthanlost.net> | 2010-06-16 03:25:52 +1000 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | c75b2199ca57f4101f1a731fec603f69349c0d5a (patch) | |
| tree | afc6d37972537ee4c2fd887a06650808a8ba72fb /lib | |
| parent | 8b127b185171c516b0d3ab526e0f7606063582bb (diff) | |
| download | puppet-c75b2199ca57f4101f1a731fec603f69349c0d5a.tar.gz puppet-c75b2199ca57f4101f1a731fec603f69349c0d5a.tar.xz puppet-c75b2199ca57f4101f1a731fec603f69349c0d5a.zip | |
Fixes #3395 - CR+LF line endings in manifests cause syntax error
Thanks to Alan Barrett for the patch
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/parser/lexer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb index 7adb0b6d1..cc0b0bcda 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 = [] |