De-duplicate modular packages from input packages in keep_n_latest_pa…

…ckages (release-engineering#125)

In keep_n_latest_packages, avoid duplicated modular packages in output package list when there are duplicated modular packages in the input package list.

Fixes release-engineering#105

tests/test_ubipop.py

@@ -570,13 +570,11 @@ def test_keep_n_newest_packages_with_referenced_pkg_in_module(mock_ubipop_runner
 
 
 def test_keep_n_latest_packages_no_dupes_from_modular(mock_ubipop_runner):
-    """Ensure that modular packages referenced also in the package
-     white list are included only once in the output list.
-
-    Notice that this situation was observed only on integration tests
-    due to the test data used.
-    In practice, packages in modules have "module" as part of the
-    filename: "go-toolset-1.11.5-1.module+el8+2774+11afa8b5.x86_64.rpm"
+    """Ensure that modular packages are not duplicated in the output
+    package list.
+    Duplicates should be avoided when modular package is also present in
+    and when the there are duplicated modular packages in the input
+    package list.
     """
 
     packages = [
@@ -585,6 +583,11 @@ def test_keep_n_latest_packages_no_dupes_from_modular(mock_ubipop_runner):
             filename="tomcatjss-7.3.7-1.el8+1944+b6c8e16f.noarch.rpm",
             is_modular=True,
         ),
+        get_test_pkg(
+            name="tomcatjss",
+            filename="tomcatjss-7.3.7-1.el8+1944+b6c8e16f.noarch.rpm",
+            is_modular=True,
+        ),
         get_test_pkg(
             name="tomcatjss",
             filename="tomcatjss-7.3.7-1.el8+1944+b6c8e16f.noarch.rpm",

ubipop/__init__.py

@@ -766,7 +766,8 @@ def keep_n_latest_packages(self, packages, n=1):
                 # with different arches for package in one repository
                 _, _, _, _, arch = split_filename(package.filename)
                 pkgs_per_arch[arch].append(package)
-            elif package.filename in modular_packages_filenames:
+            elif (package.filename in modular_packages_filenames
+                  and package.filename not in filenames_to_keep):
                 # this skips modular pkgs that are not referenced by module
                 packages_to_keep.append(package)
                 filenames_to_keep.add(package.filename)