aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMartin Afanasjew2016-07-30 14:59:16 +0200
committerMartin Afanasjew2016-07-30 14:59:16 +0200
commit1244aa6ecec36541a96ea4a2ee9840bde30fed4a (patch)
tree5626214693842acdd24a43856a711b22968226cf /Library
parent0a33cc591d258e07f2279bc0440d62e38983fd67 (diff)
downloadbrew-1244aa6ecec36541a96ea4a2ee9840bde30fed4a.tar.bz2
utils: fix option handling in 'odisabled'
Options passed to `odisabled` were completely ignored. Instead, merge them with the defaults that distinguish `odisabled` from `odeprecated`.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/utils.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index aaf9d8ba5..1c4be7047 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -152,7 +152,8 @@ def odeprecated(method, replacement = nil, options = {})
end
def odisabled(method, replacement = nil, options = {})
- odeprecated(method, replacement, :die => true, :caller => caller)
+ options = { :die => true, :caller => caller }.merge(options)
+ odeprecated(method, replacement, options)
end
def pretty_installed(f)