diff options
| -rw-r--r-- | lib/puppet/util/inifile.rb | 2 | ||||
| -rwxr-xr-x | test/util/inifile.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/util/inifile.rb b/lib/puppet/util/inifile.rb index d050e6dd1..bd01759ba 100644 --- a/lib/puppet/util/inifile.rb +++ b/lib/puppet/util/inifile.rb @@ -129,7 +129,7 @@ module Puppet::Util::IniConfig section.mark_clean unless section.nil? section = add_section($1, file) optname = nil - elsif l =~ /^\s*([^\s=]+)\s*\=(.+)$/ + elsif l =~ /^\s*([^\s=]+)\s*\=(.*)$/ # We allow space around the keys, but not the values # For the values, we don't know if space is significant if section.nil? diff --git a/test/util/inifile.rb b/test/util/inifile.rb index bdac23f7d..d27e7993c 100755 --- a/test/util/inifile.rb +++ b/test/util/inifile.rb @@ -93,7 +93,7 @@ class TestFileType < Test::Unit::TestCase end def test_continuation - cont = "[main]\nkey1=v1\nkey2=v2a\n v2b\n" + cont = "[main]\nkey1=v1\nkey2=v2a\n v2b\nkey3=\n\tv3a\n v3b\n" fname = mkfile(cont) assert_nothing_raised { @file.read(fname) @@ -101,6 +101,7 @@ class TestFileType < Test::Unit::TestCase s = get_section('main') assert_equal('v1', s['key1']) assert_equal("v2a\n v2b", s['key2']) + assert_equal("\n\tv3a\n v3b", s['key3']) assert_equal(cont, s.format) end |