Fix bottle prefix and repository handling #9481
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MikeMcQuaid
added
the
critical
|
Review period ended. |
BrewTestBot
approved these changes
Dec 9, 2020
BrewTestBot
approved these changes
Dec 9, 2020
MikeMcQuaid
force-pushed
the
bottle_prefix_repository_handling
branch
3 times, most recently
from
c43840e
to
f223fbb
Compare
We were previously only looking at the `cellar` value when pouring bottles and ignoring the `prefix` and (implicit) `repository`. Actually look at these values and set the defaults for each platform. Also, when we're relocating to create or pour bottles when `prefix` and `repository` are equal then skip relocating the `repository` and always use references to the `prefix` instead. Fixes #9453
MikeMcQuaid
force-pushed
the
bottle_prefix_repository_handling
branch
from
f223fbb
to
0f9bad0
Compare
fxcoudert
approved these changes
Dec 9, 2020
|
Fixes bottling issues on ARM Big Sur (tested on |
9 tasks
7 tasks
|
After this PR, it is no longer possible to install $ git clone --reference=/usr/local/Homebrew https://github.com/Homebrew/brew ~/.homebrew
$ git clone --reference=/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core https://github.com/Homebrew/homebrew-core ~/.homebrew/Library/Taps/homebrew/homebrew-core
$ ~/.homebrew/bin/brew install hello
Warning: Building hello from source as the bottle needs:
- HOMEBREW_CELLAR: any_skip_relocation (yours is /Users/shaun.jackman/.homebrew/Cellar)
- HOMEBREW_PREFIX: /usr/local (yours is /Users/shaun.jackman/.homebrew)
- HOMEBREW_REPOSITORY: /usr/local/Homebrew (yours is /Users/shaun.jackman/.homebrew)
==> Downloading https://ftp.gnu.org/gnu/hello/hello-2.10.tar.gz
…
$ ~/.homebrew/bin/brew --version
Homebrew 2.6.2-9-g26a59c9
Homebrew/homebrew-core (git revision 1b4630; last commit 2020-12-14) |
3 tasks
|
After this PR, $ git clone --reference=/usr/local/Homebrew https://github.com/Homebrew/brew ~/.homebrew
$ git clone --reference=/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core https://github.com/Homebrew/homebrew-core ~/.homebrew/Library/Taps/homebrew/homebrew-core
$ ~/.homebrew/bin/brew install --force-hello hello
==> Downloading https://homebrew.bintray.com/bottles/hello-2.10.catalina.bottle.
Already downloaded: /Users/shaun.jackman/Library/Caches/Homebrew/downloads/6a8a266068965d3a7ea16bfe4821367cb94c47f904e7fc23ec61fad8a9859c54--hello-2.10.catalina.bottle.tar.gz
Error: undefined method `stage' for nil:NilClassIssue reported at #9521 |
Fixed in #10025 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We were previously only looking at the
cellarvalue when pouring bottles and ignoring theprefixand (implicit)repository.Actually look at these values and set the defaults for each platform.
Also, when we're relocating to create or pour bottles when
prefixandrepositoryare equal then skip relocating therepositoryand always use references to theprefixinstead.Fixes #9453