aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend/string.rb
diff options
context:
space:
mode:
authorTrevor Wennblom2011-07-22 13:52:45 -0500
committerAdam Vandenberg2011-07-27 17:38:26 -0700
commit55791d4c10afd0286939ba65268d3eade0fc516e (patch)
tree5218fad2a385fbb0d6cadd765f5878adeb1ce5bd /Library/Homebrew/extend/string.rb
parente3e7831b48b7dbcb435f5233adcff33f91aef3da (diff)
downloadbrew-55791d4c10afd0286939ba65268d3eade0fc516e.tar.bz2
Coerce flags to an array in `remove_make_var!`
This is needed for Ruby 1.9.x compatibility, but we still don't support running Homebrew with anything other than a system provided 1.8.[67]. Fixes Homebrew/homebrew#6546 Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Homebrew/extend/string.rb')
-rw-r--r--Library/Homebrew/extend/string.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/Library/Homebrew/extend/string.rb b/Library/Homebrew/extend/string.rb
index 0246f0c90..3238f97df 100644
--- a/Library/Homebrew/extend/string.rb
+++ b/Library/Homebrew/extend/string.rb
@@ -22,6 +22,8 @@ module StringInreplaceExtension
# Removes variable assignments completely.
def remove_make_var! flags
+ # Next line is for Ruby 1.9.x compatibility
+ flags = [flags] unless flags.kind_of? Array
flags.each do |flag|
# Also remove trailing \n, if present.
gsub! Regexp.new("^#{flag}[ \\t]*=(.*)$\n?"), ""