[RHELC-1675] Add handling for rhel9 systems in duplicate package check

oamg · Sep 3, 2024 · 58803b7 · 58803b7
1 parent 2a0ed40
commit 58803b7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/convert2rhel/actions/system_checks/duplicate_packages.py b/convert2rhel/actions/system_checks/duplicate_packages.py
@@ -42,7 +42,7 @@ def run(self):
             self.duplicate_packages_failure()
             return
         # For el8 machines we can depend on just the return code being 1 to know the check failed
-        if system_info.version.major == 8 and ret_code == 1:
+        if system_info.version.major >= 8 and ret_code == 1:
             self.duplicate_packages_failure()
             return
         duplicate_packages = filter(None, output.split("\n"))

diff --git a/convert2rhel/unit_tests/actions/system_checks/duplicate_packages_test.py b/convert2rhel/unit_tests/actions/system_checks/duplicate_packages_test.py
@@ -55,6 +55,16 @@ def duplicate_packages_action():
             "package1.x86_64\npackage1.i686\npackage1.s390x\npackage2.x86_64\npackage2.ppc64le\n",
             ["package1.x86_64", "package1.i686", "package1.s390x", "package2.x86_64", "package2.ppc64le"],
         ),
+        (
+            Version(9, 4),
+            "package1.x86_64\npackage1.s390x\npackage2.x86_64\npackage2.ppc64le\n",
+            ["package1.x86_64", "package1.s390x", "package2.x86_64", "package2.ppc64le"],
+        ),
+        (
+            Version(9, 4),
+            "package1.x86_64\npackage1.i686\npackage1.s390x\npackage2.x86_64\npackage2.ppc64le\n",
+            ["package1.x86_64", "package1.i686", "package1.s390x", "package2.x86_64", "package2.ppc64le"],
+        ),
     ),
 )
 def test_duplicate_packages_error(