_validate_deps: Discard configdict["pkg"]["USE"] #1297
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
zmedico
force-pushed
the
bug_675748_fix_doeebuild_validate_deps_invalid_USE
branch
from
980445e
to
1232fde
Compare
thesamesam
approved these changes
Mar 3, 2024
zmedico
force-pushed
the
bug_675748_fix_doeebuild_validate_deps_invalid_USE
branch
from
1232fde
to
3ea4c3e
Compare
zmedico
commented
Mar 3, 2024
| # Demonstrate that settings.configdict["pkg"]["USE"] contains our arbitrary | ||
| # package.use setting in order to trigger bug 675748. | ||
| self.assertEqual(settings.configdict["pkg"]["USE"], arbitrary_package_use) | ||
|
|
There was a problem hiding this comment.
Any chance of a test case, or is it a pain because of ResolverPlayground?
I was able to add some package.env and package.use settings in testDoebuild that create a state like the one which triggered bug 925625.
Does it work if we do it with global USE? I guess not? If not, it's fine obviously and I wouldn't worry about it.
By global USE do you mean like configdict["env"]["USE"] which would be like the setting from emerge --info? That value should never have any effect on _validate_deps.
There was a problem hiding this comment.
I also realized that we could do this to avoid a redundant setcpv call in _validate_deps:
# A USE calculation from setcpv should always be available here because
# mysettings.mycpv is not None, so use it to prevent redundant setcpv calls.
metadata["USE"] = mysettings["PORTAGE_USE"]Since configdict["pkg"]["USE"] may contain package.use settings from config.setcpv, it is inappropriate to use here (bug 675748), so discard it. This is only an issue because configdict["pkg"] is a sub-optimal place to extract metadata from. This issue does not necessarily indicate a flaw in the Package constructor, since passing in precalculated USE can be valid for things like autounmask USE changes. Bug: https://bugs.gentoo.org/675748 Signed-off-by: Zac Medico <zmedico@gentoo.org>
zmedico
force-pushed
the
bug_675748_fix_doeebuild_validate_deps_invalid_USE
branch
from
3ea4c3e
to
6ce2be8
Compare
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.
Since configdict["pkg"]["USE"] may contain package.use settings from config.setcpv, it is inappropriate to use here (bug 675748), so discard it. This is only an issue because configdict["pkg"] is a sub-optimal place to extract metadata from. This issue does not necessarily indicate a flaw in the Package constructor, since passing in precalculated USE can be valid for things like autounmask USE changes.
Bug: https://bugs.gentoo.org/675748