aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
authorJack Nagel2013-02-17 22:54:43 -0600
committerJack Nagel2013-02-18 12:13:36 -0600
commit4d341f2115661b3e88589d91b5df74c9d889b778 (patch)
tree99ec33a9e576555457b5cef9637688a9cb5ef0e5 /Library/Homebrew/extend
parent33393a2597916d8e73009dd981dfcb07ea669434 (diff)
downloadhomebrew-4d341f2115661b3e88589d91b5df74c9d889b778.tar.bz2
Don't shadow outer local variables
Diffstat (limited to 'Library/Homebrew/extend')
-rw-r--r--Library/Homebrew/extend/ENV.rb12
1 files changed, 6 insertions, 6 deletions
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?