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

Fix system() exception showing regression

Browse Source 
Rather than showing a backtrace that says "couldn't find command blah". Admittedly it's possible that the error will be something else, but unlikely. And this is neater.

Ideally we'd push the bt through an error pipe like we do with install.rb. And I guess we'll do this eventually.
This commit is contained in:
Max Howell 2009-11-11 19:42:35 +00:00
parent 627034c441
commit 4bd32c615e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/formula.rb
View File

@ -226,7 +226,8 @@ protected
rd.close rd.close
$stdout.reopen wr $stdout.reopen wr
$stderr.reopen wr $stderr.reopen wr
exec cmd, *args exec(cmd, *args) rescue nil
exit! 1 # never gets here unless exec threw or failed
end end
wr.close wr.close
out = '' out = ''

4
Library/Homebrew/utils.rb
View File

@ -88,8 +88,8 @@ end
def safe_system cmd, *args def safe_system cmd, *args
puts "#{cmd} #{args*' '}" if ARGV.verbose? puts "#{cmd} #{args*' '}" if ARGV.verbose?
fork do fork do
trap("EXIT") {} # no bt on exit from this short-lived fork exec(cmd, *args) rescue nil
exit! 1 unless exec(cmd, *args) exit! 1 # never gets here unless exec failed
end end
Process.wait Process.wait
raise ExecutionError.new(cmd, args, $?) unless $?.success? raise ExecutionError.new(cmd, args, $?) unless $?.success?