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

dev-cmd/bottle: fix pkg_version comparison on merge

Browse Source
This commit is contained in:
Bo Anderson 2021-11-08 03:39:18 +00:00
parent 98c082ca94
commit 38ebaac869
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -626,9 +626,15 @@ module Homebrew
path = HOMEBREW_REPOSITORY/bottle_hash["formula"]["path"]
formula = Formulary.factory(path)
old_bottle_spec = formula.bottle_specification
old_pkg_version = formula.pkg_version
FormulaVersions.new(formula).formula_at_revision("origin/HEAD") do |upstream_f|
old_pkg_version = upstream_f.pkg_version
end
old_bottle_spec_matches = old_bottle_spec &&
bottle_hash["formula"]["pkg_version"] == formula.pkg_version.to_s &&
bottle_hash["formula"]["pkg_version"] == old_pkg_version.to_s &&
bottle.root_url == old_bottle_spec.root_url &&
old_bottle_spec.collector.tags.present?