aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMax Howell2012-03-15 13:04:17 +0000
committerMax Howell2012-03-15 13:04:17 +0000
commit544b3c38c84d349734f259d71735ef15d6e0a78c (patch)
tree1db728b24f5506a4388af5f466bbb1efe095d4a4 /Library
parent59436b194d0ea19b3c6459d61967a6c0c3aa6a25 (diff)
downloadbrew-544b3c38c84d349734f259d71735ef15d6e0a78c.tar.bz2
ohai'ing this is ugly IMO
I wanted to make it possible to not do the additional newline (in brew) if this code path is hit. But I didn't see a way to do it without overriding the Interrupt exception and throwing a new one. “Never add more code than necessary for aesthetics in error handling.” — mxcl
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/formula.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 26b25cbf7..d2d8995d2 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -191,10 +191,11 @@ class Formula
# so load any deps before this point! And exit asap afterwards
yield self
rescue Interrupt, RuntimeError, SystemCallError => e
+ puts if Interrupt === e # don't print next to the ^C
unless ARGV.debug?
%w(config.log CMakeCache.txt).select{|f| File.exist? f}.each do |f|
HOMEBREW_LOGS.install f
- ohai "#{f} was copied to #{HOMEBREW_LOGS}"
+ puts "#{f} was copied to #{HOMEBREW_LOGS}"
end
raise
end