From 1244aa6ecec36541a96ea4a2ee9840bde30fed4a Mon Sep 17 00:00:00 2001 From: Martin Afanasjew Date: Sat, 30 Jul 2016 14:59:16 +0200 Subject: [PATCH] utils: fix option handling in 'odisabled' Options passed to `odisabled` were completely ignored. Instead, merge them with the defaults that distinguish `odisabled` from `odeprecated`. --- Library/Homebrew/utils.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index aaf9d8ba52..1c4be70479 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)