admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

ARGV#resolved_formulae: also load build options

Browse Source
This commit is contained in:
Xu Cheng 2016-07-15 15:03:58 +08:00
parent 2e747aa910
commit 7452dcf508
No known key found for this signature in database
GPG Key ID: C2A3860FA0B459CE
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/extend/ARGV.rb
View File

@ -27,9 +27,11 @@ module HomebrewArgvExtension
@resolved_formulae ||= (downcased_unique_named - casks).map do |name| @resolved_formulae ||= (downcased_unique_named - casks).map do |name|
if name.include?("/") if name.include?("/")
f = Formulary.factory(name, spec) f = Formulary.factory(name, spec)
if spec(default=nil).nil? && f.any_version_installed? if f.any_version_installed?
installed_spec = Tab.for_formula(f).spec tab = Tab.for_formula(f)
f.set_active_spec(installed_spec) if f.send(installed_spec) resolved_spec = spec(default=nil) || tab.spec
f.set_active_spec(resolved_spec) if f.send(resolved_spec)
f.build = tab
end end
f f
else else

4
Library/Homebrew/formulary.rb
View File

@ -227,7 +227,7 @@ class Formulary
tap = tab.tap tap = tab.tap
spec ||= tab.spec spec ||= tab.spec
if tap.nil? f = if tap.nil?
factory(rack.basename.to_s, spec) factory(rack.basename.to_s, spec)
else else
begin begin
@ -237,6 +237,8 @@ class Formulary
factory(rack.basename.to_s, spec) factory(rack.basename.to_s, spec)
end end
end end
f.build = tab
f
end end
# Return a Formula instance directly from contents # Return a Formula instance directly from contents