From 1cbc78c5dd7f68e1a038428cb5b4a3ab126d401e Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 1 Jun 2018 20:39:39 +0100 Subject: [PATCH] Further tweak formula installer runtime dep handling 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. --- Library/Homebrew/formula_installer.rb | 4 ++-- Library/Homebrew/tab.rb | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 6a55ff58b4..1d54a111d4 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -613,8 +613,8 @@ class FormulaInstaller # Update tab with actual runtime dependencies tab = Tab.for_keg(keg) Tab.clear_cache - tab.runtime_dependency_objects = - formula.runtime_dependencies(read_from_tab: false) + f_runtime_deps = formula.runtime_dependencies(read_from_tab: false) + tab.runtime_dependencies = Tab.runtime_deps_hash(f_runtime_deps) tab.write # let's reset Utils.git_available? if we just installed git diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb index 3b20ec19b4..fb6d45cafb 100644 --- a/Library/Homebrew/tab.rb +++ b/Library/Homebrew/tab.rb @@ -266,10 +266,6 @@ class Tab < OpenStruct super unless parsed_homebrew_version < "1.1.6" end - def runtime_dependency_objects=(deps) - source["runtime_dependencies"] = Tab.runtime_deps_hash(deps) - end - def cxxstdlib # Older tabs won't have these values, so provide sensible defaults lib = stdlib.to_sym if stdlib