From d965bbba4753a92512f2cb136a29e90bf6199e1f Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 13 Mar 2014 10:05:55 -0500 Subject: [PATCH] Allow the debugger to work from inside staged resources References Homebrew/homebrew#23263. Closes Homebrew/homebrew#27445. --- Library/Homebrew/build.rb | 2 ++ Library/Homebrew/debrew.rb | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index 2d2bb861a0..985d0bae42 100755 --- a/Library/Homebrew/build.rb +++ b/Library/Homebrew/build.rb @@ -167,6 +167,8 @@ class Build else f.prefix.mkpath + f.resources.each { |r| r.extend(ResourceDebugger) } if ARGV.debug? + begin f.install diff --git a/Library/Homebrew/debrew.rb b/Library/Homebrew/debrew.rb index e0d562cc9f..2946533e29 100644 --- a/Library/Homebrew/debrew.rb +++ b/Library/Homebrew/debrew.rb @@ -1,5 +1,6 @@ require 'debrew/menu' require 'debrew/raise_plus' +require 'set' unless ENV['HOMEBREW_NO_READLINE'] begin @@ -15,7 +16,27 @@ class Object include RaisePlus end +module ResourceDebugger + def stage(&block) + super do + begin + block.call(self) + rescue Exception => e + if ARGV.debug? + debrew e + else + raise + end + end + end + end +end + +$debugged_exceptions = Set.new + def debrew(exception, formula=nil) + raise exception unless $debugged_exceptions.add?(exception) + puts "#{exception.backtrace.first}" puts "#{Tty.red}#{exception.class.to_s}#{Tty.reset}: #{exception.to_s}"