From 5121b2f5099c56ca3f86fa4c6bf5b7602ca4eb3e Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 9 Dec 2013 17:35:05 -0600 Subject: bottle: clean up after interrupts --- Library/Homebrew/cmd/bottle.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 3437f8e65..c63dd21d1 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -160,9 +160,13 @@ module Homebrew extend self relocatable = !keg_contains(prefix_check, keg) relocatable = !keg_contains(HOMEBREW_CELLAR, keg) && relocatable + rescue Interrupt + ignore_interrupts { bottle_path.unlink if bottle_path.exist? } ensure - keg.relocate_install_names Keg::PREFIX_PLACEHOLDER, prefix, - Keg::CELLAR_PLACEHOLDER, cellar, :keg_only => f.keg_only? + ignore_interrupts do + keg.relocate_install_names Keg::PREFIX_PLACEHOLDER, prefix, + Keg::CELLAR_PLACEHOLDER, cellar, :keg_only => f.keg_only? + end end end -- cgit v1.2.3