[reposync] Add latest NEVRAs per stream to download (RhBug: 1833074) #407
Conversation
plugins/reposync.py
Outdated
| stream_artifacts.update(module.getArtifacts()) | ||
| # find versions to which the packages with the highest NEVRAs belong | ||
| for lp in query.filter(nevra_strict=stream_artifacts).latest(): | ||
| #XXX contains modules.yaml allways full NEVRA (including epoch?) |
There was a problem hiding this comment.
I am sorry but I do not understand xxx note.
There was a problem hiding this comment.
OK, the thing is that I need to pair package objects to artefacts as they are written in modules.yaml (artifacts are keys of the artifact_version dictionary). Currently the code relies on having artifacts in form of full NEVRA. I was just wondering if there is possibility that artifacts in modules.yaml are in a different format (e.g. zero epoch being left out).
plugins/reposync.py
Outdated
| for lp in query.filter(nevra_strict=stream_artifacts).latest(): | ||
| #XXX contains modules.yaml allways full NEVRA (including epoch?) | ||
| nevra = "{0.name}-{0.epoch}:{0.version}-{0.release}.{0.arch}".format(lp) | ||
| versions.update(artifact_version[nevra][namestream]) |
There was a problem hiding this comment.
I am not 100 % sure, but what happen in case when the latest artefact is present in all or multiple versions? Somehow I feel that in this case all versions will be downloaded. I suggest that in this case only the latest context should be used.
There was a problem hiding this comment.
Yes, currently all versions with the latest artefact versions are going to be downloaded. I'll try to limit it to the latest version in this case.
plugins/reposync.py
Outdated
| for module in modules: | ||
| stream_artifacts.update(module.getArtifacts()) | ||
| # find versions to which the packages with the highest NEVRAs belong | ||
| for lp in query.filter(nevra_strict=stream_artifacts).latest(): |
There was a problem hiding this comment.
What about to rename lp to pkg or latest_pkg?
plugins/reposync.py
Outdated
| versions.add(max(artifact_version[nevra][namestream])) | ||
| # add all artifacts from selected versions for synchronization | ||
| for version, modules in version_dict.items(): | ||
| if version in versions: |
There was a problem hiding this comment.
This not a problem, but anyway, the code could use a different logic.
for version in versions:
for module in version_dict[version]:
|
The logic and code LGTM! |
This covers situation when package with the newest NEVRA is part of an older version of a stream and reposync was used with --newest-only switch. With this patch these package versions are going to be downloaded: - the latest NEVRAs from non-modular packages - all packages from stream version with the latest package NEVRA (in case the latest NEVRA is part of multiple stream versions only the highest is downloaded) - all packages from the latest stream version https://bugzilla.redhat.com/show_bug.cgi?id=1833074
m-blaha
force-pushed
the
mblaha/reposync-latest
branch
from
1fe2dac
to
37d60b6
Compare
|
Thanks Jardo, I squashed all the commits into one (they were just unnecessary development noise) and fixed issues you found in it. |
|
@rh-atomic-bot try |
This covers situation when package with the newest NEVRA is part of an older version of a stream and reposync was used with --newest-only switch. With this patch these package versions are going to be downloaded: - the latest NEVRAs from non-modular packages - all packages from stream version with the latest package NEVRA (in case the latest NEVRA is part of multiple stream versions only the highest is downloaded) - all packages from the latest stream version https://bugzilla.redhat.com/show_bug.cgi?id=1833074 Closes: #407 Approved by: <try>
|
☀️ Test successful - status-papr |
|
📌 Commit 37d60b6 has been approved by |
|
I suspect that |
This covers situation when package with the newest NEVRA is part of
an older version of a stream.
https://bugzilla.redhat.com/show_bug.cgi?id=1833074
Test: rpm-software-management/ci-dnf-stack#875