diff options
author | Luke Kanies <luke@madstop.com> | 2008-03-25 18:18:34 -0500 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2008-03-25 18:18:34 -0500 |
commit | a8592f1009040ebf30a98268610915cc33bb3f63 (patch) | |
tree | 49f61323a8536d58ce332e97b882677f55727df7 /lib/puppet/util/fileparsing.rb | |
parent | e1907798425a7b163ac1b831b0cf11e88985815e (diff) | |
parent | 491a69682728818e04b8a20a5d8f4f783ad6ddaf (diff) | |
download | puppet-a8592f1009040ebf30a98268610915cc33bb3f63.tar.gz puppet-a8592f1009040ebf30a98268610915cc33bb3f63.tar.xz puppet-a8592f1009040ebf30a98268610915cc33bb3f63.zip |
Merge branch '0.24.x'
Conflicts:
install.rb
lib/puppet/defaults.rb
man/man8/puppet.8
Diffstat (limited to 'lib/puppet/util/fileparsing.rb')
-rw-r--r-- | lib/puppet/util/fileparsing.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/util/fileparsing.rb b/lib/puppet/util/fileparsing.rb index 8e39719c8..23d02ea60 100644 --- a/lib/puppet/util/fileparsing.rb +++ b/lib/puppet/util/fileparsing.rb @@ -223,7 +223,8 @@ module Puppet::Util::FileParsing # Split text into separate lines using the record separator. def lines(text) # Remove any trailing separators, and then split based on them - text.sub(/#{self.line_separator}\Q/,'').split(self.line_separator) + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + x = text.sub(/#{self.line_separator}\Q/,'').split(self.line_separator) end # Split a bunch of text into lines and then parse them individually. |