@@ -22,6 +22,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # FORMULA_META_FILES = %w[README ChangeLog COPYING LICENSE COPYRIGHT AUTHORS] +PLEASE_REPORT_BUG = "#{Tty.white}Please report this bug to #{Tty.em}#{HOMEBREW_WWW}#{Tty.reset}" def __make url, name require 'formula' Library/Homebrew/brew.h.rb @@ -7,15 +7,6 @@ ABS__FILE__=File.expand_path(__FILE__) $:.push(File.expand_path(__FILE__+'/../..')) require 'extend/pathname' -require 'utils' -require 'hardware' -require 'formula' -require 'download_strategy' -require 'keg' -require 'utils' -require 'brew.h' -require 'hardware' -require 'update' # these are defined in global.rb, but we don't want to break our actual # homebrew tree, and we do want to test everything :) @@ -24,12 +15,23 @@ HOMEBREW_REPOSITORY=HOMEBREW_PREFIX HOMEBREW_CACHE=HOMEBREW_PREFIX.parent+"cache" HOMEBREW_CELLAR=HOMEBREW_PREFIX.parent+"cellar" HOMEBREW_USER_AGENT="Homebrew" +HOMEBREW_WWW='http://example.com' MACOS_VERSION=10.6 (HOMEBREW_PREFIX+'Library'+'Formula').mkpath Dir.chdir HOMEBREW_PREFIX at_exit { HOMEBREW_PREFIX.parent.rmtree } +require 'utils' +require 'hardware' +require 'formula' +require 'download_strategy' +require 'keg' +require 'utils' +require 'brew.h' +require 'hardware' +require 'update' + # for some reason our utils.rb safe_system behaves completely differently # during these tests. This is worrying for sure. def safe_system *args Library/Homebrew/test/unittest.rb @@ -250,16 +250,22 @@ rescue SystemExit rescue Interrupt => e puts # seemingly a newline is typical exit 130 +rescue BuildError => e + ohai "Backtrace" + puts e.backtrace + ohai "Environment" + dump_config + puts "Exit status: #{e.status}" + onoe e + puts PLEASE_REPORT_BUG + exit 1 +rescue RuntimeError, SystemCallError => e + onoe e + puts e.backtrace if ARGV.debug? + exit 1 rescue Exception => e - 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? - + puts PLEASE_REPORT_BUG + puts e.backtrace exit 1 end bin/brew 35a9b0468d2590756281c4c48c2c6c59e59d0576 Max Howell max@methylblue.com http://github.com/piranha/homebrew/commit/70bed072472f61ce15711ab17fafeb2381b9eef5 70bed072472f61ce15711ab17fafeb2381b9eef5 2009-11-11T17:37:02-08:00 2009-11-11T17:33:14-08:00 More tweaking of main exception handler output db87b88afb5db6a2248a7b1bba7b3337722e57c3 Max Howell max@methylblue.com