diff --git a/Library/Homebrew/extend/os/mac/formula_cellar_checks.rb b/Library/Homebrew/extend/os/mac/formula_cellar_checks.rb index c09ed11a06..4a77eb486c 100644 --- a/Library/Homebrew/extend/os/mac/formula_cellar_checks.rb +++ b/Library/Homebrew/extend/os/mac/formula_cellar_checks.rb @@ -67,8 +67,9 @@ module FormulaCellarChecks keg = Keg.new(formula.prefix) CacheStoreDatabase.use(:linkage) do |db| - checker = LinkageChecker.new keg, formula, cache_db: db, - use_cache: !ENV["HOMEBREW_LINKAGE_CACHE"].nil? + checker = LinkageChecker.new( + keg, formula, cache_db: db, use_cache: !ENV["HOMEBREW_LINKAGE_CACHE"].nil? + ) next unless checker.broken_library_linkage? output = <<~EOS diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 0560e6cd16..6609fc7d83 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1528,8 +1528,9 @@ class Formula return [] unless keg undeclared_deps = CacheStoreDatabase.use(:linkage) do |db| - linkage_checker = LinkageChecker.new keg, self, cache_db: db, - use_cache: !ENV["HOMEBREW_LINKAGE_CACHE"].nil? + linkage_checker = LinkageChecker.new( + keg, self, cache_db: db, use_cache: !ENV["HOMEBREW_LINKAGE_CACHE"].nil? + ) linkage_checker.undeclared_deps.map { |n| Dependency.new(n) } end diff --git a/Library/Homebrew/linkage_cache_store.rb b/Library/Homebrew/linkage_cache_store.rb index a3d1625770..cb2df93c5b 100644 --- a/Library/Homebrew/linkage_cache_store.rb +++ b/Library/Homebrew/linkage_cache_store.rb @@ -17,7 +17,7 @@ class LinkageCacheStore < CacheStore # Returns `true` if the database has any value for the current `keg_name` # # @return [Boolean] - def has_keg_name? + def keg_exists? !database.get(keg_name).nil? end @@ -72,9 +72,11 @@ class LinkageCacheStore < CacheStore private - ARRAY_LINKAGE_TYPES = [:system_dylibs, :variable_dylibs, :broken_dylibs, - :indirect_deps, :undeclared_deps, :unnecessary_deps].freeze - HASH_LINKAGE_TYPES = [:brewed_dylibs, :reverse_links, :broken_deps].freeze + ARRAY_LINKAGE_TYPES = [ + :system_dylibs, :variable_dylibs, :broken_dylibs, :indirect_deps, + :undeclared_deps, :unnecessary_deps + ].freeze + HASH_LINKAGE_TYPES = [:brewed_dylibs, :reverse_links, :broken_deps].freeze # @return [String] the key to lookup items in the `CacheStore` attr_reader :keg_name diff --git a/Library/Homebrew/linkage_checker.rb b/Library/Homebrew/linkage_checker.rb index 10d79a03f3..559e1d7fa3 100644 --- a/Library/Homebrew/linkage_checker.rb +++ b/Library/Homebrew/linkage_checker.rb @@ -9,7 +9,7 @@ class LinkageChecker if use_cache @store = LinkageCacheStore.new(keg.name, cache_db) - flush_cache_and_check_dylibs unless @store.has_keg_name? + flush_cache_and_check_dylibs unless @store.keg_exists? else flush_cache_and_check_dylibs end