From 8864287cf209ebac2a8613f673eb62ecb8b37cdc Mon Sep 17 00:00:00 2001 From: Claudia Date: Fri, 7 Aug 2020 08:57:54 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=9Cwrong=20number=20of=20arguments?= =?UTF-8?q?=E2=80=9D=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit fixes an error introduced in 6c964d4a78, which would surface on certain install/reinstall/upgrade failures. Example: ``` ==> Patching patching file default_out.txt Hunk #2 FAILED at 11. 1 out of 2 hunks FAILED -- saving rejects to file default_out.txt.rej Error: wrong number of arguments (given 3, expected 2) /usr/local/Homebrew/Library/Homebrew/reinstall.rb:77:in `restore_backup' /usr/local/Homebrew/Library/Homebrew/reinstall.rb:52:in `block in reinstall_formula' /usr/local/Homebrew/Library/Homebrew/utils.rb:377:in `ignore_interrupts' /usr/local/Homebrew/Library/Homebrew/reinstall.rb:52:in `rescue in reinstall_formula' /usr/local/Homebrew/Library/Homebrew/reinstall.rb:10:in `reinstall_formula' /usr/local/Homebrew/Library/Homebrew/cmd/reinstall.rb:71:in `block in reinstall' /usr/local/Homebrew/Library/Homebrew/cmd/reinstall.rb:65:in `each' /usr/local/Homebrew/Library/Homebrew/cmd/reinstall.rb:65:in `reinstall' /usr/local/Homebrew/Library/Homebrew/brew.rb:112:in `
' ``` --- Library/Homebrew/reinstall.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/reinstall.rb b/Library/Homebrew/reinstall.rb index 96234cb04f..5fade3cb78 100644 --- a/Library/Homebrew/reinstall.rb +++ b/Library/Homebrew/reinstall.rb @@ -74,7 +74,7 @@ module Homebrew end end - def restore_backup(keg, keg_was_linked) + def restore_backup(keg, keg_was_linked, verbose:) path = backup_path(keg) return unless path.directory?