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

Merge pull request #10130 from iMichka/prefixes

Browse Source 
bottle --merge: check for all cellars
This commit is contained in:
Michka Popoff 2020-12-24 12:52:08 +01:00 committed by GitHub
commit 7b24507440
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -552,7 +552,11 @@ module Homebrew
old_value = old_bottle_spec.send(key) old_value = old_bottle_spec.send(key)
next if key == :rebuild && old_value.zero? next if key == :rebuild && old_value.zero?
next if key == :prefix && old_value == Homebrew::DEFAULT_PREFIX next if key == :prefix && old_value == Homebrew::DEFAULT_PREFIX
next if key == :cellar && old_value == Homebrew::DEFAULT_REPOSITORY next if key == :cellar && [
Homebrew::DEFAULT_MACOS_CELLAR,
Homebrew::DEFAULT_MACOS_ARM_CELLAR,
Homebrew::DEFAULT_LINUX_CELLAR,
].include?(old_value)
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