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

pr-upload: style tweaks

Browse Source 
Co-authored-by: Dawid Dziurla <dawidd0811@gmail.com>
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Jonathan Chang 2020-07-26 21:46:37 +10:00
parent ebfd308241
commit 80b62d8c2c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/dev-cmd/pr-upload.rb
View File

@ -33,13 +33,17 @@ module Homebrew
end end
def check_bottled_formulae(json_files) def check_bottled_formulae(json_files)
json_files.reduce({}) { |hash, json| hash.deep_merge(JSON.parse(IO.read(json))) }.each do |name, hash| hashes = json_files.reduce({}) do |hash, json|
hash.deep_merge(JSON.parse(IO.read(json)))
end
hashes.each do |name, hash|
formula_path = HOMEBREW_REPOSITORY/hash["formula"]["path"] formula_path = HOMEBREW_REPOSITORY/hash["formula"]["path"]
formula_version = Formulary::FormulaLoader.new(name, formula_path).get_formula("stable").version formula_version = Formulary::FormulaLoader.new(name, formula_path).get_formula("stable").version
bottle_version = Version.new hash["formula"]["pkg_version"] bottle_version = Version.new hash["formula"]["pkg_version"]
if formula_version != bottle_version next if formula_version == bottle_version
odie "Bottles are for #{name} #{bottle_version} but formula is version #{formula_version}!"
end odie "Bottles are for #{name} #{bottle_version} but formula is version #{formula_version}!"
end end
end end
@ -61,7 +65,7 @@ module Homebrew
if args.dry_run? if args.dry_run?
puts "brew #{bottle_args.join " "}" puts "brew #{bottle_args.join " "}"
puts "Upload bottles described by these JSON files to Bintray:\n #{Dir["*.json"].join("\n ")}" puts "Upload bottles described by these JSON files to Bintray:\n #{json_files.join("\n ")}"
else else
check_bottled_formulae(json_files) check_bottled_formulae(json_files)
safe_system HOMEBREW_BREW_FILE, *bottle_args safe_system HOMEBREW_BREW_FILE, *bottle_args