admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Fix change_make_var! for empty variables.

Browse Source 
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
Martin Kühl 2010-03-12 13:24:04 +01:00 committed by Adam Vandenberg
parent 1e9c7df871
commit d03411775f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/test/test_inreplace.rb
View File

@ -6,6 +6,14 @@ class InreplaceTest < Test::Unit::TestCase
s1.change_make_var! "FLAG", "def" s1.change_make_var! "FLAG", "def"
assert_equal "FLAG=def", s1 assert_equal "FLAG=def", s1
end end
def test_change_make_var_empty
# Replace empty flag
s1="FLAG = \nFLAG2=abc"
s1.extend(HomebrewInreplaceExtension)
s1.change_make_var! "FLAG", "def"
assert_equal "FLAG=def\nFLAG2=abc", s1
end
def test_change_make_var_append def test_change_make_var_append
# Append to flag # Append to flag

2
Library/Homebrew/utils.rb
View File

@ -157,7 +157,7 @@ module HomebrewInreplaceExtension
# value with "new_value", or removes the definition entirely. # value with "new_value", or removes the definition entirely.
def change_make_var! flag, new_value def change_make_var! flag, new_value
new_value = "#{flag}=#{new_value}" new_value = "#{flag}=#{new_value}"
gsub! Regexp.new("^#{flag}\\s*=\\s*(.*)$"), new_value gsub! Regexp.new("^#{flag}\\s*=[ \\t]*(.*)$"), new_value
end end
# Removes variable assignments completely. # Removes variable assignments completely.
def remove_make_var! flags def remove_make_var! flags