aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorJack Nagel2013-12-09 17:35:05 -0600
committerJack Nagel2013-12-09 17:35:05 -0600
commit5121b2f5099c56ca3f86fa4c6bf5b7602ca4eb3e (patch)
tree034c0dc0605fb85590e6293dc567c40c35c99df6 /Library/Homebrew/cmd
parent8838b5040741457deb545425cd64e1970ee6bc2a (diff)
downloadhomebrew-5121b2f5099c56ca3f86fa4c6bf5b7602ca4eb3e.tar.bz2
bottle: clean up after interrupts
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/bottle.rb8
1 files changed, 6 insertions, 2 deletions
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