diff options
author | Morgan Haskel <morgan@puppetlabs.com> | 2014-12-16 17:32:40 -0800 |
---|---|---|
committer | Morgan Haskel <morgan@puppetlabs.com> | 2014-12-16 17:32:40 -0800 |
commit | 49acade831d06182bb63a0c8042341a07db2e5b0 (patch) | |
tree | 17c110fe8ec52b636a91a65acb4c13889295f62f /lib/puppet | |
parent | 6237446582d71aa722b71ad8873f63c0662b20f7 (diff) | |
parent | 80f09623b63cf6946b5913b629911e2c49b5d1dd (diff) |
Merge remote-tracking branch 'upstream/4.5.x' into merge_4.5.x_into_master
Conflicts:
metadata.json
Diffstat (limited to 'lib/puppet')
-rw-r--r-- | lib/puppet/type/file_line.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb index 9dbe43c..df263e6 100644 --- a/lib/puppet/type/file_line.rb +++ b/lib/puppet/type/file_line.rb @@ -71,12 +71,5 @@ Puppet::Type.newtype(:file_line) do unless self[:line] and self[:path] raise(Puppet::Error, "Both line and path are required attributes") end - - if (self[:match]) - unless Regexp.new(self[:match]).match(self[:line]) - raise(Puppet::Error, "When providing a 'match' parameter, the value must be a regex that matches against the value of your 'line' parameter") - end - end - end end |