From b60770dba985dfaab8bedc04e7c3b6a5c3a59d51 Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Fri, 29 Nov 2019 10:48:55 +0100
Subject: [PATCH] Redesign reposync --newest_only for modular system
 (RhBug:1775434)

reposync --newest_only will download all latest non-modular packages
plus all packages for contexts with latest version for each module
stream.

https://bugzilla.redhat.com/show_bug.cgi?id=1775434
---
 plugins/reposync.py | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/plugins/reposync.py b/plugins/reposync.py
index 10e9b0b5..c1bc6a99 100644
--- a/plugins/reposync.py
+++ b/plugins/reposync.py
@@ -203,11 +203,35 @@ def download_metadata(self, repo):
         repo._repo.downloadMetadata(repo_target)
         return True
 
+    def _get_latest(self, query):
+        """
+        return query with latest nonmodular package and all packages from latest version per stream
+        """
+        if not dnf.base.WITH_MODULES:
+            return query.latest()
+        query.apply()
+        module_packages = self.base._moduleContainer.getModulePackages()
+        all_artifacts = set()
+        module_dict = {}  # {NameStream: {Version: [modules]}}
+        for module_package in module_packages:
+            all_artifacts.update(module_package.getArtifacts())
+            module_dict.setdefault(module_package.getNameStream(), {}).setdefault(
+                module_package.getVersionNum(), []).append(module_package)
+        non_modular_latest = query.filter(
+            pkg__neq=query.filter(nevra_strict=all_artifacts)).latest()
+        latest_artifacts = set()
+        for version_dict in module_dict.values():
+            keys = sorted(version_dict.keys(), reverse=True)
+            for module in version_dict[keys[0]]:
+                latest_artifacts.update(module.getArtifacts())
+        latest_modular_query = query.filter(nevra_strict=latest_artifacts)
+        return latest_modular_query.union(non_modular_latest)
+
     def get_pkglist(self, repo):
         query = self.base.sack.query(flags=hawkey.IGNORE_MODULAR_EXCLUDES).available().filterm(
             reponame=repo.id)
         if self.opts.newest_only:
-            query = query.latest()
+            query = self._get_latest(query)
         if self.opts.source:
             query.filterm(arch='src')
         elif self.opts.arches: