bottle: Skip matches to files in build deps #5366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

sjackman merged 1 commit into Homebrew:master from sjackman:bottle

Dec 3, 2018

Contributor

sjackman commented Dec 2, 2018 •

edited

Loading

Files in build dependencies are not required at run time.

Have you followed the guidelines in our Contributing document?
Have you checked to ensure there aren't other open Pull Requests for the same change?
Have you added an explanation of what your changes do and why you'd like us to include them?
Have you written new tests for your changes? Here's an example.
Have you successfully run brew style with your changes locally?
Have you successfully run brew tests with your changes locally?

This PR addresses the issue that topgrade is detected as being non-relocatable on macOS, when it ought to be cellar :any_skip_relocation.
For details see #5365 (comment)
cc @iMichka

sjackman force-pushed the bottle branch from 41ddab6 to 4bacf7e Compare

December 2, 2018 19:03

sjackman requested a review from MikeMcQuaid

December 2, 2018 19:03

sjackman self-assigned this

MikeMcQuaid requested changes

View reviewed changes

Member

MikeMcQuaid left a comment

Seems like a good approach, nice work 👍

Library/Homebrew/dev-cmd/bottle.rb Outdated

Member

MikeMcQuaid Dec 2, 2018

Could this just check for paths that don't exist? Seems like it might be more specific and therefore more likely to find cellar :any relocations.

Contributor Author

sjackman Dec 2, 2018

Sure

Library/Homebrew/dev-cmd/bottle.rb Outdated

Member

MikeMcQuaid Dec 2, 2018

Does this match cases where it's a random path inside a Keg rather than the actual keg?

Contributor Author

sjackman Dec 2, 2018

Yes

Library/Homebrew/dev-cmd/bottle.rb Outdated

Member

MikeMcQuaid Dec 2, 2018

Could this be passed through as an argument (to keg_contain?) instead? More obvious to me than relying on a instance variable declared elsewhere.

Contributor Author

sjackman Dec 2, 2018

Done.

sjackman force-pushed the bottle branch 2 times, most recently from 2c21d35 to 47d43d8 Compare

December 2, 2018 19:58

Contributor Author

sjackman commented Dec 2, 2018

Seems like a good approach, nice work 👍

Thanks, Mike!

sjackman force-pushed the bottle branch from 47d43d8 to 944c124 Compare

December 2, 2018 20:25

MikeMcQuaid reviewed

View reviewed changes

Library/Homebrew/dev-cmd/bottle.rb Outdated

Member

MikeMcQuaid Dec 2, 2018

Make runtime_deps = [] by default or use if runtime_deps.present?

Contributor Author

sjackman Dec 2, 2018

I didn't know about .present?. Nice!

Library/Homebrew/dev-cmd/bottle.rb Outdated

Member

MikeMcQuaid Dec 2, 2018

formula_and_runtime_deps_names?


          bottle: Skip matches to files in build deps

cbeb077

Files in build dependencies are not required at run time.

sjackman force-pushed the bottle branch from 944c124 to cbeb077 Compare

December 2, 2018 21:29

Contributor Author

sjackman commented Dec 3, 2018

@MikeMcQuaid Good to merge?

MikeMcQuaid approved these changes

View reviewed changes

Contributor Author

sjackman commented Dec 3, 2018

Merged. Thanks for the review, Mike!

sjackman merged commit 704e857 into Homebrew:master

sjackman deleted the bottle branch

December 3, 2018 16:00

lock bot added the outdated label

lock bot locked as resolved and limited conversation to collaborators

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels