summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHunter Haugen <hunter@puppetlabs.com>2014-12-18 15:55:33 -0800
committerHunter Haugen <hunter@puppetlabs.com>2014-12-18 15:55:33 -0800
commit1ae0a1070710fdb3e2f377a42109b231c3ccc103 (patch)
treec87a7d62ac8e18eed7f3b2223f789a49244f6708 /lib
parentbe46f0ea328c7cecfcaeef4696e289bb6adfa124 (diff)
parent49acade831d06182bb63a0c8042341a07db2e5b0 (diff)
downloadpuppet-stdlib-1ae0a1070710fdb3e2f377a42109b231c3ccc103.tar.gz
puppet-stdlib-1ae0a1070710fdb3e2f377a42109b231c3ccc103.tar.bz2
Merge pull request #388 from mhaskel/merge_4.5.x_into_master
Merge 4.5.x into master
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/type/file_line.rb7
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