[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 1e89bff59448bfc22c22f0b03bf965b7f4da0c77
Author: James Turnbull <james at lovedthanlost.net>
Date:   Wed Jun 16 03:22:17 2010 +1000

    Fixes #3514 - CR/LF line ending in puppet.conf cause silent failure
    
    Patch thanks to Alan Barrett

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 11d760f..2dedc31 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -894,13 +894,13 @@ Generated on #{Time.now}.
         text.split(/\n/).each { |line|
             count += 1
             case line
-            when /^\s*\[(\w+)\]$/
+            when /^\s*\[(\w+)\]\s*$/
                 section = $1.intern # Section names
                 # Add a meta section
                 result[section][:_meta] ||= {}
             when /^\s*#/; next # Skip comments
             when /^\s*$/; next # Skip blanks
-            when /^\s*(\w+)\s*=\s*(.*)$/ # settings
+            when /^\s*(\w+)\s*=\s*(.*?)\s*$/ # settings
                 var = $1.intern
 
                 # We don't want to munge modes, because they're specified in octal, so we'll

-- 
Puppet packaging for Debian