aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2013-01-09 18:30:33 -0600
committerJack Nagel2013-01-09 18:33:35 -0600
commitbdd9ff51b4c2a159e558a85b76a8769aadde84cb (patch)
tree6705473cfc938d24e2d56443002bfda5c48ab978 /Library
parentd169e0d64b20ad3c5e848225ec07239f34effc03 (diff)
downloadhomebrew-bdd9ff51b4c2a159e558a85b76a8769aadde84cb.tar.bz2
Don't store test Proc if we might need to marshall the formula
Procs cannot be marshalled, but formula objects may be as part of the BuildError exception. If the formula object has a reference to a Proc, this will fail. Work around it by not storing the test Procs during installations.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/formula.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 2a9e4e704..f8a21ab36 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -800,7 +800,11 @@ private
def test &block
return @test unless block_given?
- @test = block
+ # If this formula is the executing script, we are performing an
+ # install. Since it may be marshalled back to the main process as
+ # part of an exception, don't store this Proc because Procs can't
+ # be marshalled.
+ @test = block unless $0 != HOMEBREW_BREW_FILE.to_s
end
end
end