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

Print warning if given old short name of renamed formula

Browse Source
This commit is contained in:
fn ⌃ ⌥ 2021-11-17 22:20:48 -08:00
parent 38630a6f80
commit db0c1d999b
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/formulary.rb
View File

@ -564,23 +564,16 @@ module Formulary
return FormulaLoader.new(name, path) return FormulaLoader.new(name, path)
end end
if (newref = CoreTap.instance.formula_renames[ref]) return TapLoader.new("#{CoreTap.instance}/#{ref}", from: from) if CoreTap.instance.formula_renames.key?(ref)
formula_with_that_oldname = core_path(newref)
return FormulaLoader.new(newref, formula_with_that_oldname) if formula_with_that_oldname.file?
end
possible_tap_newname_formulae = [] possible_taps = Tap.select { |tap| tap.formula_renames.key?(ref) }
Tap.each do |tap|
if (newref = tap.formula_renames[ref])
possible_tap_newname_formulae << "#{tap.name}/#{newref}"
end
end
if possible_tap_newname_formulae.size > 1 if possible_taps.size > 1
possible_tap_newname_formulae = possible_taps.map { |tap| "#{tap}/#{tap.formula_renames[ref]}" }
raise TapFormulaWithOldnameAmbiguityError.new(ref, possible_tap_newname_formulae) raise TapFormulaWithOldnameAmbiguityError.new(ref, possible_tap_newname_formulae)
end end
return TapLoader.new(possible_tap_newname_formulae.first, from: from) unless possible_tap_newname_formulae.empty? return TapLoader.new("#{possible_taps.first}/#{ref}", from: from) unless possible_taps.empty?
possible_keg_formula = Pathname.new("#{HOMEBREW_PREFIX}/opt/#{ref}/.brew/#{ref}.rb") possible_keg_formula = Pathname.new("#{HOMEBREW_PREFIX}/opt/#{ref}/.brew/#{ref}.rb")
return FormulaLoader.new(ref, possible_keg_formula) if possible_keg_formula.file? return FormulaLoader.new(ref, possible_keg_formula) if possible_keg_formula.file?