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

Make Pathname.prepend WriteMkpathExtension as late as possible.

Browse Source 
Let's avoid weirdness in other parts of Homebrew by moving this prepend
to be as late as possible.
This commit is contained in:
Mike McQuaid 2025-09-02 17:00:34 +01:00
parent 9da27e1ac2
commit e28fe444a5
No known key found for this signature in database
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/build.rb
View File

@ -183,6 +183,8 @@ class Build
(formula.logs/"00.options.out").write \ (formula.logs/"00.options.out").write \
"#{formula.full_name} #{formula.build.used_options.sort.join(" ")}".strip "#{formula.full_name} #{formula.build.used_options.sort.join(" ")}".strip
Pathname.prepend WriteMkpathExtension
formula.install formula.install
stdlibs = detect_stdlibs stdlibs = detect_stdlibs
@ -247,8 +249,6 @@ begin
options = Options.create(args.flags_only) options = Options.create(args.flags_only)
build = Build.new(formula, options, args:) build = Build.new(formula, options, args:)
Pathname.prepend WriteMkpathExtension
build.install build.install
# Any exception means the build did not complete. # Any exception means the build did not complete.
# The `case` for what to do per-exception class is further down. # The `case` for what to do per-exception class is further down.

2
Library/Homebrew/postinstall.rb
View File

@ -32,8 +32,8 @@ begin
end end
Pathname.prepend WriteMkpathExtension Pathname.prepend WriteMkpathExtension
formula.run_post_install formula.run_post_install
# Handle all possible exceptions. # Handle all possible exceptions.
rescue Exception => e # rubocop:disable Lint/RescueException rescue Exception => e # rubocop:disable Lint/RescueException
error_pipe&.puts e.to_json error_pipe&.puts e.to_json

3
Library/Homebrew/test.rb
View File

@ -45,10 +45,9 @@ begin
formula.extend(Debrew::Formula) formula.extend(Debrew::Formula)
end end
Pathname.prepend WriteMkpathExtension
ENV.extend(Stdenv) ENV.extend(Stdenv)
ENV.setup_build_environment(formula:, testing_formula: true) ENV.setup_build_environment(formula:, testing_formula: true)
Pathname.prepend WriteMkpathExtension
# tests can also return false to indicate failure # tests can also return false to indicate failure
run_test = proc { |_ = nil| raise "test returned false" if formula.run_test(keep_tmp: args.keep_tmp?) == false } run_test = proc { |_ = nil| raise "test returned false" if formula.run_test(keep_tmp: args.keep_tmp?) == false }