diff options
| author | Mike McQuaid | 2016-10-09 15:26:31 +0100 |
|---|---|---|
| committer | GitHub | 2016-10-09 15:26:31 +0100 |
| commit | 0546d90e3dbdae30407e5256d680be5ed5f5f000 (patch) | |
| tree | b1c09cd0fe0bee8819811174ddce23797353cb66 /Library | |
| parent | 0c193c308ecfac9a6c9dba514a9d3991f8c6cecf (diff) | |
| parent | 21ff82be7f7cc64866d41d0fdc905b66d714196f (diff) | |
| download | brew-0546d90e3dbdae30407e5256d680be5ed5f5f000.tar.bz2 | |
Merge pull request #1251 from MikeMcQuaid/diagnostic-no-write-tmp1.0.7
diagnostic: handle HOMEBREW_TEMP mktmpdir failure.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/diagnostic.rb | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index 394b766ae..f2260ed03 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -644,13 +644,18 @@ module Homebrew real_cellar = HOMEBREW_CELLAR.realpath where_cellar = volumes.which real_cellar - tmp = Pathname.new(Dir.mktmpdir("doctor", HOMEBREW_TEMP)) begin - real_tmp = tmp.realpath.parent - where_tmp = volumes.which real_tmp - ensure - Dir.delete tmp + tmp = Pathname.new(Dir.mktmpdir("doctor", HOMEBREW_TEMP)) + begin + real_tmp = tmp.realpath.parent + where_tmp = volumes.which real_tmp + ensure + Dir.delete tmp + end + rescue + return end + return if where_cellar == where_tmp <<-EOS.undent |
