mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

build_environment: add proper types to dump() and fix inreplace error

Browse Source
This commit is contained in:
Sean Molenaar 2022-08-11 09:35:02 +02:00
parent 4a623e0a25
commit 2de6958a36
No known key found for this signature in database
GPG Key ID: 6BF5D8DF0D34FAAE
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/build_environment.rb
View File

@ -55,22 +55,23 @@ class BuildEnvironment
].freeze
private_constant :KEYS
sig { params(env: T.untyped).returns(T::Array[String]) }
sig { params(env: T::Hash[String, T.nilable(T.any(String, Pathname))]).returns(T::Array[String]) }
def self.keys(env)
KEYS & env.keys
end
sig { params(env: T.untyped, f: IO).void }
sig { params(env: T::Hash[String, T.nilable(T.any(String, Pathname))], f: IO).void }
def self.dump(env, f = $stdout)
keys = self.keys(env)
keys -= %w[CC CXX OBJC OBJCXX] if env["CC"] == env["HOMEBREW_CC"]
keys.each do |key|
value = env.fetch(key)
s = +"#{key}: #{value}"
case key
when "CC", "CXX", "LD"
s << " => #{Pathname.new(value).realpath}" if File.symlink?(value)
s << " => #{Pathname.new(value).realpath}" if value.present? && File.symlink?(value)
end
s.freeze
f.puts s

2
Library/Homebrew/cmd/--env.rb
View File

@ -51,7 +51,7 @@ module Homebrew
if shell.nil?
BuildEnvironment.dump ENV
else
BuildEnvironment.keys(ENV).each do |key|
BuildEnvironment.keys(ENV.to_h).each do |key|
puts Utils::Shell.export_value(key, ENV.fetch(key), shell)
end
end

13
Library/Homebrew/exceptions.rb
View File

@ -466,9 +466,19 @@ end
# Raised when an error occurs during a formula build.
class BuildError < RuntimeError
extend T::Sig
attr_reader :cmd, :args, :env
attr_accessor :formula, :options
sig {
params(
formula: T.nilable(Formula),
cmd: T.any(String, Pathname),
args: T::Array[T.any(String, Pathname, Integer)],
env: T::Hash[String, T.untyped],
).void
}
def initialize(formula, cmd, args, env)
@formula = formula
@cmd = cmd
@ -478,10 +488,12 @@ class BuildError < RuntimeError
super "Failed executing: #{cmd} #{pretty_args}".strip
end
sig { returns(T::Array[T.untyped]) }
def issues
@issues ||= fetch_issues
end
sig { returns(T::Array[T.untyped]) }
def fetch_issues
GitHub.issues_for_formula(formula.name, tap: formula.tap, state: "open")
rescue GitHub::API::RateLimitExceededError => e
@ -489,6 +501,7 @@ class BuildError < RuntimeError
[]
end
sig { params(verbose: T::Boolean).void }
def dump(verbose: false)
puts

2
Library/Homebrew/formula.rb
View File

@ -2219,7 +2219,7 @@ class Formula
def inreplace(paths, before = nil, after = nil, audit_result = true) # rubocop:disable Style/OptionalBooleanParameter
super(paths, before, after, audit_result)
rescue Utils::Inreplace::Error
raise BuildError.new(self, "inreplace", paths, nil)
raise BuildError.new(self, "inreplace", paths, {})
end
protected