summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/delete.rb
diff options
context:
space:
mode:
authorHelen <helen@puppetlabs.com>2016-04-15 13:29:23 +0100
committerHelen <helen@puppetlabs.com>2016-04-15 13:29:23 +0100
commitd9f65387c99c99177f94075fc840e7c574e07417 (patch)
treee2b1bf7362973650efdcac0a3be68df7d9bae8f6 /lib/puppet/parser/functions/delete.rb
parent29961218a74bfdae96371c42a3c336e714c79a93 (diff)
parent085035dccebbf27cf2bfd7f1d9101c746f5178a2 (diff)
Merge pull request #595 from tphoney/4.12.0_release
master to 4.12.x
Diffstat (limited to 'lib/puppet/parser/functions/delete.rb')
-rw-r--r--lib/puppet/parser/functions/delete.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/parser/functions/delete.rb b/lib/puppet/parser/functions/delete.rb
index f548b44..8435163 100644
--- a/lib/puppet/parser/functions/delete.rb
+++ b/lib/puppet/parser/functions/delete.rb
@@ -2,8 +2,6 @@
# delete.rb
#
-# TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
-
module Puppet::Parser::Functions
newfunction(:delete, :type => :rvalue, :doc => <<-EOS
Deletes all instances of a given element from an array, substring from a
@@ -34,7 +32,7 @@ string, or key from a hash.
Array(arguments[1]).each do |item|
case collection
when Array, Hash
- collection.delete item
+ collection.delete_if { |coll_item| coll_item =~ %r{#{item}} }
when String
collection.gsub! item, ''
else