Restore PM-specific option specification in mock config #1074
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
cottsay
force-pushed
the
cottsay/mock-pm-cmd
branch
2 times, most recently
from
0ef1812 to
a3374bb
Compare
|
This is pretty messy, but we need to unblock RHEL 9 builds. The CI on this PR demonstrates that it's working as expected, and I manually verified that we didn't regress Fedora. |
azeey
approved these changes
Oct 31, 2024
nuclearsandwich
approved these changes
Oct 31, 2024
Comment on lines
24
to
26
| # Deal with dnf -> dnf4 transition - see rpm-software-management/mock#1496 | ||
| if package_manager == 'dnf': | ||
| config_opts[f'dnf4_builddep_opts'] = config_opts.get(f'dnf4_builddep_opts', []) + ['--setopt=install_weak_deps=True'] |
There was a problem hiding this comment.
Is this needed on top of L22 because config_opts['dnf4_builddep_opts'] is checked in addition to / instead of config_opts['dnf_builddep_opts'] in some situations? If so, I think @azeey's suggestion also makes sense.
There was a problem hiding this comment.
The transition in mock is pretty muddy. The situations I'm aware of are:
- There is only
dnfanddnf_builddep_opts - package_manager is
dnf, which is an alias fordnf4anddnf4_builddep_optsis what we want set - package_manager is now
dnf4and we wantdnf4_builddep_optsas before
TBH it doesn't really hurt to drop the conditional and just set the config even if it won't be used, but I think may help in future forensics to understand the purpose of the duplicated code.
It appears that we actually WANT this configuration key to change with the package manager, and this will be required as mock now supports multiple DNF tools. This is all a bit of a mess right now. There isn't a straightforward way to determine which package manager we should be using, and mock is in the process of transitioning the default PM to dnf5, where it was previously unversioned dnf (which means dnf4). This reverts part of ed19495
cottsay
force-pushed
the
cottsay/mock-pm-cmd
branch
from
a3374bb to
d162c54
Compare
azeey
approved these changes
Nov 1, 2024
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.
It appears that we actually WANT this configuration key to change with the package manager, and this will be required as mock now supports multiple DNF tools.
This reverts part of ed19495