From 55791d4c10afd0286939ba65268d3eade0fc516e Mon Sep 17 00:00:00 2001 From: Trevor Wennblom Date: Fri, 22 Jul 2011 13:52:45 -0500 Subject: [PATCH] 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 --- Library/Homebrew/extend/string.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/extend/string.rb b/Library/Homebrew/extend/string.rb index 0246f0c909..3238f97df7 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?"), ""