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

bottle: clean up after interrupts

Browse Source
This commit is contained in:
Jack Nagel 2013-12-09 17:35:05 -06:00
parent c3ac88d8c7
commit 4afd633570
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/bottle.rb
View File

@ -160,9 +160,13 @@ module Homebrew extend self
relocatable = !keg_contains(prefix_check, keg) relocatable = !keg_contains(prefix_check, keg)
relocatable = !keg_contains(HOMEBREW_CELLAR, keg) && relocatable relocatable = !keg_contains(HOMEBREW_CELLAR, keg) && relocatable
rescue Interrupt
ignore_interrupts { bottle_path.unlink if bottle_path.exist? }
ensure ensure
keg.relocate_install_names Keg::PREFIX_PLACEHOLDER, prefix, ignore_interrupts do
Keg::CELLAR_PLACEHOLDER, cellar, :keg_only => f.keg_only? keg.relocate_install_names Keg::PREFIX_PLACEHOLDER, prefix,
Keg::CELLAR_PLACEHOLDER, cellar, :keg_only => f.keg_only?
end
end end
end end