Fix brew bottle --merge

This commit is contained in:
Jack Nagel 2014-03-11 09:16:14 -05:00
parent c8478e8ce3
commit da26203912

View File

@ -186,6 +186,12 @@ module Homebrew extend self
end end
end end
module BottleMerger
def bottle(&block)
instance_eval(&block)
end
end
def merge def merge
merge_hash = {} merge_hash = {}
ARGV.named.each do |argument| ARGV.named.each do |argument|
@ -198,7 +204,7 @@ module Homebrew extend self
merge_hash.each do |formula_name, bottle_blocks| merge_hash.each do |formula_name, bottle_blocks|
ohai formula_name ohai formula_name
bottle = BottleSpecification.new bottle = BottleSpecification.new.extend(BottleMerger)
bottle_blocks.each { |block| bottle.instance_eval(block) } bottle_blocks.each { |block| bottle.instance_eval(block) }
output = bottle_output bottle output = bottle_output bottle