@@ -236,37 +236,27 @@ begin end rescue FormulaUnspecifiedError - puts "This command requires a formula argument" - exit 1 + abort "This command requires a formula argument" rescue KegUnspecifiedError - puts "This command requires a keg argument" - exit 1 + abort "This command requires a keg argument" rescue UsageError onoe "Invalid usage" - puts ARGV.usage - exit 1 + abort ARGV.usage rescue SystemExit puts "Kernel.exit" if ARGV.verbose? - exit 1 rescue Interrupt => e puts # seemingly a newline is typical exit 130 -rescue SystemCallError, RuntimeError => e - if ARGV.debug? - onoe e.inspect - puts e.backtrace - else - onoe e - if e.kind_of? BuildError - puts please_report_bug - puts "Exit Status: #{e.status}" - end - end - exit 1 rescue Exception => e - onoe "Homebrew has failed you :(" - puts please_report_bug - puts e.inspect - puts e.backtrace + fatal = !(RuntimeError === e or SystemCallError === e) + + onoe e + if BuildError === e or fatal + puts "#{Tty.white}Please report this bug to #{Tty.em}#{HOMEBREW_WWW}#{Tty.reset}" + dump_config + puts "Exit status: #{e.status}" if BuildError === e + end + puts e.backtrace if fatal or ARGV.debug? + exit 1 end bin/brew b669f4b300bf5cc43fc10ba3e1a196a2cddb67c2 Max Howell max@methylblue.com http://github.com/KieranP/homebrew/commit/a785a5ee8104b0f5764416d031c86d7dc2124727 a785a5ee8104b0f5764416d031c86d7dc2124727 2009-11-11T10:43:03-08:00 2009-11-11T10:38:50-08:00 dump_config for certain exceptions Ideally we could do a get request and fill in the issue form at GitHub. Presumably though, we'd only do this if the user typed brew report or somesuch. Someone should get that implemented! aa9907376e7c9718eade8ada53f058a250e8af42 Max Howell max@methylblue.com