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

tap: rmdir when tap failed or interrupted

Browse Source 
Fixes Homebrew/homebrew#43280.

Closes Homebrew/homebrew#43352.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2015-08-28 14:33:00 +08:00
parent 3458b99d6e
commit a5aba7f7d8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/cmd/tap.rb
View File

@ -25,7 +25,16 @@ module Homebrew
remote = clone_target || "https://github.com/#{tap.user}/homebrew-#{tap.repo}" remote = clone_target || "https://github.com/#{tap.user}/homebrew-#{tap.repo}"
args = %W[clone #{remote} #{tap.path}] args = %W[clone #{remote} #{tap.path}]
args << "--depth=1" unless ARGV.include?("--full") args << "--depth=1" unless ARGV.include?("--full")
safe_system "git", *args
begin
safe_system "git", *args
rescue Interrupt, ErrorDuringExecution
ignore_interrupts do
sleep 0.1 # wait for git to cleanup the top directory when interrupt happens.
tap.path.parent.rmdir_if_possible
end
raise
end
formula_count = tap.formula_files.size formula_count = tap.formula_files.size
puts "Tapped #{formula_count} formula#{plural(formula_count, "e")} (#{tap.path.abv})" puts "Tapped #{formula_count} formula#{plural(formula_count, "e")} (#{tap.path.abv})"