formulary: use formula path when loading from bottle #8531
Merged
+1
−1
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.
brew style
with your changes locally?brew tests
with your changes locally?This makes a small but significant change to
Formulary::BottleLoader
- the call toFormulary.from_contents
should be given the path to the formula instead of the bottle file path. This allows the formula tap to be properly determined as it uses thepath
argument to make this determination.As far as I can tell, passing
@bottle_filename
was having no effect as usually this would be an arbitrary filepath that would makeTap.from_path
returnnil
For example,
path
could be/usr/local/Homebrew/Library/Taps/myorg/mytap2/myformula.rb
, and@bottle_filename
could be~/Downloads/bottles/myformula--0.0.1.catalina.bottle.tar.gz
This patch allows a formula that has the same name as another formula in a different tap to be installed from a bottle file.
Before:
After: