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

Block form of chdir can only be used once

Browse Source 
If you nest them, the library complains. So let's not do that.

/cc @jacknagel
This commit is contained in:
Max Howell 2012-08-29 19:17:53 -04:00
parent e1ff17ed75
commit 3fbe631b02
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/extend/fileutils.rb
View File

@ -13,12 +13,16 @@ module FileUtils extend self
# If the user has FileVault enabled, then we can't mv symlinks from the # If the user has FileVault enabled, then we can't mv symlinks from the
# /tmp volume to the other volume. So we let the user override the tmp # /tmp volume to the other volume. So we let the user override the tmp
# prefix if they need to. # prefix if they need to.
tmp_prefix = ENV['HOMEBREW_TEMP'] || '/tmp' tmp = ENV['HOMEBREW_TEMP'].chuzzle || '/tmp'
tmp = Pathname.new(`/usr/bin/mktemp -d #{tmp_prefix}/homebrew-#{name}-#{version}-XXXX`.chomp) tempd = `/usr/bin/mktemp -d #{tmp}/brew-#{name}-#{version}-XXXX`.chuzzle
raise "Failed to create sandbox: #{tmp}" unless tmp.directory? prevd = pwd
cd(tmp){ yield } cd tempd
yield
rescue StandardError
raise "Failed to create sandbox"
ensure ensure
ignore_interrupts{ tmp.rmtree } if tmp cd prevd if prevd
ignore_interrupts{ rm_r tempd } if tempd
end end
# A version of mkdir that also changes to that folder in a block. # A version of mkdir that also changes to that folder in a block.