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

Further tweak formula installer runtime dep handling

Browse Source 
Instead of adding a custom method to `Tab` use `Tab.runtime_deps_hash`
within `FormulaInstaller` to ensure the `runtime_dependencies` are in
the right format.
This commit is contained in:
Mike McQuaid 2018-06-01 20:39:39 +01:00
parent 2863a88499
commit 1cbc78c5dd
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/formula_installer.rb
View File

@ -613,8 +613,8 @@ class FormulaInstaller
# Update tab with actual runtime dependencies # Update tab with actual runtime dependencies
tab = Tab.for_keg(keg) tab = Tab.for_keg(keg)
Tab.clear_cache Tab.clear_cache
tab.runtime_dependency_objects = f_runtime_deps = formula.runtime_dependencies(read_from_tab: false)
formula.runtime_dependencies(read_from_tab: false) tab.runtime_dependencies = Tab.runtime_deps_hash(f_runtime_deps)
tab.write tab.write
# let's reset Utils.git_available? if we just installed git # let's reset Utils.git_available? if we just installed git

4
Library/Homebrew/tab.rb
View File

@ -266,10 +266,6 @@ class Tab < OpenStruct
super unless parsed_homebrew_version < "1.1.6" super unless parsed_homebrew_version < "1.1.6"
end end
def runtime_dependency_objects=(deps)
source["runtime_dependencies"] = Tab.runtime_deps_hash(deps)
end
def cxxstdlib def cxxstdlib
# Older tabs won't have these values, so provide sensible defaults # Older tabs won't have these values, so provide sensible defaults
lib = stdlib.to_sym if stdlib lib = stdlib.to_sym if stdlib