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

bottle: fix --merge test failure

Browse Source
This commit is contained in:
Seeker 2020-12-23 09:34:18 -08:00 committed by Michka Popoff
parent 1ea8b82a54
commit 4f2b74a149
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -550,6 +550,9 @@ module Homebrew
rebuild: new_bottle_hash["rebuild"], rebuild: new_bottle_hash["rebuild"],
}.each do |key, new_value| }.each do |key, new_value|
old_value = old_bottle_spec.send(key) old_value = old_bottle_spec.send(key)
next if key == :rebuild && old_value.zero?
next if key == :prefix && old_value == Homebrew::DEFAULT_PREFIX
next if key == :cellar && old_value == Homebrew::DEFAULT_REPOSITORY
next if key == :cellar && old_value == :any && new_value == :any_skip_relocation next if key == :cellar && old_value == :any && new_value == :any_skip_relocation
next if old_value.present? && new_value == old_value next if old_value.present? && new_value == old_value