repo: Improve *.repo config path ordering to fix a comps merging issue #1734
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
m-blaha
reviewed
Feb 23, 2021
|
Also I think the comps merging order is worth the CI stack test. |
dmach
force-pushed
the
dnf4/fix-repoconf-order
branch
from
018a6ae
to
a221f76
Compare
|
Remove the '.repo' suffix to exclude it from the sort key. Also split the paths into lists to exclude '/' from the sort key. =changelog= msg: Improve repo config path ordering to fix a comps merging issue resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1928181
dmach
force-pushed
the
dnf4/fix-repoconf-order
branch
from
a221f76
to
f8b0a7f
Compare
|
This patch fixes the original problem in anaconda: |
m-blaha
reviewed
Feb 25, 2021
| @@ -42,8 +43,16 @@ def __iter__(self): | |||
| yield r | |||
|
|
|||
| # read .repo files from directories specified by conf.reposdir | |||
| for repofn in (repofn for reposdir in self.conf.reposdir | |||
| for repofn in sorted(glob.glob('{}/*.repo'.format(reposdir)))): | |||
There was a problem hiding this comment.
Thanks for rewriting this! I really hate generators with multiple nested for cycles in them.
m-blaha
approved these changes
Feb 25, 2021
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.
Remove the '.repo' suffix to exclude it from the sort key.
Also split the paths into lists to exclude '/' from the sort key.
=changelog=
msg: Improve repo config path ordering to fix a comps merging issue
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1928181