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

utils: fix option handling in 'odisabled'

Browse Source 
Options passed to `odisabled` were completely ignored. Instead, merge
them with the defaults that distinguish `odisabled` from `odeprecated`.
This commit is contained in:
Martin Afanasjew 2016-07-30 14:59:16 +02:00
parent 0a33cc591d
commit 1244aa6ece
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/utils.rb
View File

@ -152,7 +152,8 @@ def odeprecated(method, replacement = nil, options = {})
end end
def odisabled(method, replacement = nil, options = {}) 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 end
def pretty_installed(f) def pretty_installed(f)