aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorMax Howell2009-08-10 18:17:11 +0100
committerMax Howell2009-08-10 18:17:11 +0100
commit480bfa37937ea8a0b2771daa3f5641f488d632c0 (patch)
tree7e8b464d1ba01bb04d9d7421ca9022b23e1fef73 /Library/Homebrew
parentdd7bdce89c36f7f45ebc81951d8ed80930e4d8d3 (diff)
downloadbrew-480bfa37937ea8a0b2771daa3f5641f488d632c0.tar.bz2
CTRL-C for a child process should interrupt brew too
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/formula.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index a7bcaf144..dfa70438c 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -151,8 +151,11 @@ private
# Kernel.system but with exceptions
def safe_system cmd, *args
puts "#{cmd} #{args*' '}" if ARGV.verbose?
- # stderr is shown, so hopefully that will explain the problem
- raise ExecutionError.new(cmd, args) unless Kernel.system cmd, *args and $? == 0
+
+ execd=Kernel.system cmd, *args
+ # somehow Ruby doesn't handle the CTRL-C from another process -- WTF!?
+ raise Interrupt, cmd if $?.termsig == 2
+ raise ExecutionError.new(cmd, args) unless execd and $? == 0
end
def curl url, *args