Fix rebase errors
This commit is contained in:
parent
e719666d4b
commit
3554bd0889
@ -410,7 +410,7 @@ module Homebrew
|
|||||||
|
|
||||||
bottle_tag, rebuild = if local_bottle_json
|
bottle_tag, rebuild = if local_bottle_json
|
||||||
_, tag_string, rebuild_string = Utils::Bottles.extname_tag_rebuild(formula.local_bottle_path.to_s)
|
_, tag_string, rebuild_string = Utils::Bottles.extname_tag_rebuild(formula.local_bottle_path.to_s)
|
||||||
[tag_string.to_sym, rebuild_string.to_i]
|
[T.must(tag_string).to_sym, rebuild_string.to_i]
|
||||||
end
|
end
|
||||||
|
|
||||||
bottle_tag = if bottle_tag
|
bottle_tag = if bottle_tag
|
||||||
@ -861,8 +861,7 @@ module Homebrew
|
|||||||
end
|
end
|
||||||
|
|
||||||
sig {
|
sig {
|
||||||
params(formula: Formula, formula_ast: Utils::AST::FormulaAST,
|
params(formula: Formula, formula_ast: Utils::AST::FormulaAST, bottle_hash: T::Hash[String, T.untyped])
|
||||||
bottle_hash: T::Hash[String, T.untyped])
|
|
||||||
.returns(T.nilable(T::Array[T::Hash[Symbol, T.any(String, Symbol)]]))
|
.returns(T.nilable(T::Array[T::Hash[Symbol, T.any(String, Symbol)]]))
|
||||||
}
|
}
|
||||||
def old_checksums(formula, formula_ast, bottle_hash)
|
def old_checksums(formula, formula_ast, bottle_hash)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user