From f037be514865a8dc141b7c870e7640939b5fa22a Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 17 Feb 2013 22:54:43 -0600 Subject: Don't shadow outer local variables --- Library/Homebrew/extend/ENV.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Library/Homebrew/extend') diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 6ac5a0db2..c8b567239 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -391,9 +391,9 @@ class << ENV def remove_from_cflags f remove cc_flag_vars, f end - def append key, value, separator = ' ' + def append keys, value, separator = ' ' value = value.to_s - [*key].each do |key| + Array(keys).each do |key| unless self[key].to_s.empty? self[key] = self[key] + separator + value.to_s else @@ -401,8 +401,8 @@ class << ENV end end end - def prepend key, value, separator = ' ' - [*key].each do |key| + def prepend keys, value, separator = ' ' + Array(keys).each do |key| unless self[key].to_s.empty? self[key] = value.to_s + separator + self[key] else @@ -413,8 +413,8 @@ class << ENV def prepend_path key, path prepend key, path, ':' if File.directory? path end - def remove key, value - [*key].each do |key| + def remove keys, value + Array(keys).each do |key| next unless self[key] self[key] = self[key].sub(value, '') delete(key) if self[key].to_s.empty? -- cgit v1.2.3