From 480bfa37937ea8a0b2771daa3f5641f488d632c0 Mon Sep 17 00:00:00 2001
From: Max Howell
Date: Mon, 10 Aug 2009 18:17:11 +0100
Subject: CTRL-C for a child process should interrupt brew too

---
 Library/Homebrew/formula.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Library/Homebrew')

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
-- 
cgit v1.2.3