diff options
author | Adrien Thebo <git@somethingsinistral.net> | 2013-07-11 16:26:45 -0700 |
---|---|---|
committer | Adrien Thebo <git@somethingsinistral.net> | 2013-07-11 16:26:45 -0700 |
commit | e0d4588bd2470109bd1eea4e597f1d205bf01b52 (patch) | |
tree | 07e1aae2e2028fd0b0d50f999a5cab3ddf02704c /lib/puppet/provider/file_line | |
parent | 4d2558f383e18bbe322dd0feb073555491216ab4 (diff) | |
parent | 964a9ad6193b0dd243a44ddae1509655fc9e9fb8 (diff) |
Merge branch 'pull-163'
This closes GH-163
Diffstat (limited to 'lib/puppet/provider/file_line')
-rw-r--r-- | lib/puppet/provider/file_line/ruby.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb index a3219d3..3cb9f6e 100644 --- a/lib/puppet/provider/file_line/ruby.rb +++ b/lib/puppet/provider/file_line/ruby.rb @@ -1,4 +1,3 @@ - Puppet::Type.type(:file_line).provide(:ruby) do def exists? @@ -35,8 +34,8 @@ Puppet::Type.type(:file_line).provide(:ruby) do def handle_create_with_match() regex = resource[:match] ? Regexp.new(resource[:match]) : nil match_count = lines.select { |l| regex.match(l) }.size - if match_count > 1 - raise Puppet::Error, "More than one line in file '#{resource[:path]}' matches pattern '#{resource[:match]}'" + if match_count > 1 && resource[:multiple].to_s != 'true' + raise Puppet::Error, "More than one line in file '#{resource[:path]}' matches pattern '#{resource[:match]}'" end File.open(resource[:path], 'w') do |fh| lines.each do |l| |