aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Howell2009-10-26 18:23:28 +0000
committerMax Howell2009-11-07 18:22:33 +0000
commit173f5f4a87c9e39877c1364ed4c319a81ef6dc23 (patch)
tree596058e8d20b4127c36aa1160e23e930cc699cb5
parente587c68a2acd5222b4ec0a5ed0facf74365ebabb (diff)
downloadbrew-173f5f4a87c9e39877c1364ed4c319a81ef6dc23.tar.bz2
Fixed SIGINT handling, so we can have our newline
We trap the INT in the install process now so the newline race condition is avoided. Much neater and more polished now.
-rwxr-xr-xbin/brew7
1 files changed, 2 insertions, 5 deletions
diff --git a/bin/brew b/bin/brew
index 92e1065be..46efe1f15 100755
--- a/bin/brew
+++ b/bin/brew
@@ -235,13 +235,10 @@ rescue UsageError
puts ARGV.usage
exit 1
rescue SystemExit
- ohai "Kernel.exit" if ARGV.verbose?
+ puts "Kernel.exit" if ARGV.verbose?
exit 1
rescue Interrupt => e
- # puts # seemingly a newline is typical
- # Above is now commented out because the system() call forks and then forks
- # again, so there are two of "us" so we get two exceptions raising and thus
- # two newlines, which buggers up the shell. FIXME!
+ puts # seemingly a newline is typical
exit 130
rescue SystemCallError, RuntimeError => e
if ARGV.debug?