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

Merge pull request #20475 from Homebrew/better_formulary_debugging

Browse Source 
formulary: provide ref and realpath when rejecting path.
This commit is contained in:
Mike McQuaid 2025-08-15 18:08:28 +00:00 committed by GitHub
commit 523d743705
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/formulary.rb
View File

@ -619,12 +619,13 @@ module Formulary
if Homebrew::EnvConfig.forbid_packages_from_paths? if Homebrew::EnvConfig.forbid_packages_from_paths?
path_realpath = path.realpath.to_s path_realpath = path.realpath.to_s
path_string = path.to_s path_string = path.to_s
if !path_realpath.start_with?("#{HOMEBREW_CELLAR}/", "#{HOMEBREW_LIBRARY}/Taps/", "#{HOMEBREW_CACHE}/") && if (path_realpath.end_with?(".rb") || path_string.end_with?(".rb")) &&
!path_realpath.start_with?("#{HOMEBREW_CELLAR}/", "#{HOMEBREW_LIBRARY}/Taps/", "#{HOMEBREW_CACHE}/") &&
!path_string.start_with?("#{HOMEBREW_CELLAR}/", "#{HOMEBREW_LIBRARY}/Taps/", "#{HOMEBREW_CACHE}/") !path_string.start_with?("#{HOMEBREW_CELLAR}/", "#{HOMEBREW_LIBRARY}/Taps/", "#{HOMEBREW_CACHE}/")
if path_string.include?("./") || path_string.end_with?(".rb") || path_string.count("/") != 2 if path_string.include?("./") || path_string.end_with?(".rb") || path_string.count("/") != 2
raise <<~WARNING raise <<~WARNING
Rejecting formula at #{path_string} because it's not in a tap. Homebrew requires formulae to be in a tap, rejecting:
Homebrew requires formulae to be in a tap. #{path_string} (#{path_realpath})
To create a tap, run e.g. To create a tap, run e.g.
brew tap-new <user|org>/<repository> brew tap-new <user|org>/<repository>

2
Library/Homebrew/test/formulary_spec.rb
View File

@ -126,7 +126,7 @@ RSpec.describe Formulary do
described_class.factory(temp_formula_path) described_class.factory(temp_formula_path)
ensure ensure
temp_formula_path.unlink temp_formula_path.unlink
end.to raise_error(RuntimeError, /Rejecting formula at/) end.to raise_error(RuntimeError, /requires formulae to be in a tap, rejecting/)
end end
it "returns a Formula when given a URL", :needs_utils_curl do it "returns a Formula when given a URL", :needs_utils_curl do