emerge: Make --root-deps install build deps to ROOT plus / for all EAPIs #1319
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
gentoo-bot
force-pushed
the
root-deps-both
branch
from
197d97a
to
ea8e360
Compare
Rather than instead of / for EAPI 6 and below. This changes the behaviour, but it is arguably not a breaking change, as no installations are being dropped. The previous behaviour was highly likely to break anyway. Bug: https://bugs.gentoo.org/435066 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
gentoo-bot
force-pushed
the
root-deps-both
branch
from
ea8e360
to
96f2c5a
Compare
zmedico
reviewed
May 13, 2024
| @@ -8390,7 +8398,7 @@ def _complete_graph(self, required_sets=None): | |||
| for root in self._frozen_config.roots: | |||
| if root != self._frozen_config.target_root and ( | |||
| "remove" in self._dynamic_config.myparams | |||
| or self._frozen_config.myopts.get("--root-deps") is not None | |||
| or self._frozen_config.myopts.get("--root-deps") != "rdeps" | |||
| @@ -8625,7 +8633,7 @@ def _validate_blockers(self): | |||
| dep_keys = Package._runtime_keys | |||
| for myroot in self._frozen_config.trees: | |||
| if ( | |||
| self._frozen_config.myopts.get("--root-deps") is not None | |||
| self._frozen_config.myopts.get("--root-deps") != "rdeps" | |||
| and myroot != self._frozen_config.target_root | |||
There was a problem hiding this comment.
There was a problem hiding this comment.
I don't think keeping this does any harm, and I'd rather not break anything. Same for the above. I do intend to remove the rdeps option when we drop EAPI 6, although I was discussing the need for such an option that works with EAPI 7+ with someone today. rdeps is a terrible name, so I'd probably call it something else. I'm also considering other ways to solve their problem.
There was a problem hiding this comment.
Okay that seems fair to preserve backward compat. Should these conditions use == rather than !=, in order to affect the --root-deps=rdeps case, like this?
- or self._frozen_config.myopts.get("--root-deps") is not None
+ or self._frozen_config.myopts.get("--root-deps") == "rdeps"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Rather than instead of / for EAPI 6 and below. This changes the behaviour, but it is arguably not a breaking change, as no installations are being dropped. The previous behaviour was highly likely to break anyway.
I'm not 100% sure about the changes in
_complete_graphand_validate_blockers, but I think the idea here was to skip processing when you were discarding dependencies for /. We're not doing that for bare--root-depsany more, onlyrdepsspecifically.