Skip to content
Snippets Groups Projects
Unverified Commit 831d0343 authored by Mike McQuaid's avatar Mike McQuaid
Browse files

software_spec: fix cellar any handling.

`cellar :any` actually requires no references to the cellar, prefix or
repository (not just cellar) so we can pour those bottles anywhere
regardless of the cellar, prefix or repository.
parent 61f95259
No related branches found
No related tags found
No related merge requests found
......@@ -369,16 +369,18 @@ class BottleSpecification
end
def compatible_locations?
compatible_cellar = cellar == :any ||
cellar == :any_skip_relocation ||
cellar == HOMEBREW_CELLAR.to_s
# this looks like it should check prefix and repository too but to be
# `cellar :any` actually requires no references to the cellar, prefix or
# repository.
return true if [:any, :any_skip_relocation].include?(cellar)
compatible_cellar = cellar == HOMEBREW_CELLAR.to_s
compatible_prefix = prefix == HOMEBREW_PREFIX.to_s
# Only check the repository matches if the prefix is the default.
# This is because the bottle DSL does not allow setting a custom repository
# but does allow setting a custom prefix.
compatible_repository = if prefix == Homebrew::DEFAULT_PREFIX
compatible_repository = if Homebrew.default_prefix?(prefix)
repository == HOMEBREW_REPOSITORY.to_s
else
true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment