diff --git a/convert2rhel/pkgmanager/handlers/yum/__init__.py b/convert2rhel/pkgmanager/handlers/yum/__init__.py index d8d038ff05..a6f08d381b 100644 --- a/convert2rhel/pkgmanager/handlers/yum/__init__.py +++ b/convert2rhel/pkgmanager/handlers/yum/__init__.py @@ -67,7 +67,8 @@ def _resolve_yum_problematic_dependencies(output): packages_to_remove.append(str(resolve_error[0]).replace(" ", "")) if packages_to_remove: - packages_to_remove = set(packages_to_remove) + # Need to make each item in the list unique, one pkg can be present more times in the list. + packages_to_remove = list(set(packages_to_remove)) loggerinst.debug( "Removing problematic packages to continue with the conversion:\n%s", "\n".join(packages_to_remove), diff --git a/convert2rhel/unit_tests/pkgmanager/handlers/yum/yum_test.py b/convert2rhel/unit_tests/pkgmanager/handlers/yum/yum_test.py index c17ecd1e6b..dc618cfbb2 100644 --- a/convert2rhel/unit_tests/pkgmanager/handlers/yum/yum_test.py +++ b/convert2rhel/unit_tests/pkgmanager/handlers/yum/yum_test.py @@ -393,15 +393,17 @@ def test_run_transaction_critical_error_exception(self, _mock_yum_api_calls, pre "python2-dnf-4.0.9.2-2.el7_9.noarch requires python2-hawkey >= 0.22.5", "abrt-retrace-client-2.1.11-60.el7.centos.x86_64 requires abrt = 2.1.11-60.el7.centos", ], - frozenset( - ( - "redhat-lsb-trialuse-4.1-27.el7.centos.1.x86_64", - "python2-dnf-plugins-core-4.0.2.2-3.el7_6.noarch", - "redhat-lsb-trialuse-4.1-27.el7.centos.1.x86_64", - "ldb-tools-1.5.4-2.el7.x86_64", - "redhat-lsb-trialuse-4.1-27.el7.centos.1.x86_64", - "python2-dnf-4.0.9.2-2.el7_9.noarch", - "abrt-retrace-client-2.1.11-60.el7.centos.x86_64", + list( + set( + [ + "redhat-lsb-trialuse-4.1-27.el7.centos.1.x86_64", + "python2-dnf-plugins-core-4.0.2.2-3.el7_6.noarch", + "redhat-lsb-trialuse-4.1-27.el7.centos.1.x86_64", + "ldb-tools-1.5.4-2.el7.x86_64", + "redhat-lsb-trialuse-4.1-27.el7.centos.1.x86_64", + "python2-dnf-4.0.9.2-2.el7_9.noarch", + "abrt-retrace-client-2.1.11-60.el7.centos.x86_64", + ] ) ), ), @@ -414,18 +416,20 @@ def test_run_transaction_critical_error_exception(self, _mock_yum_api_calls, pre "python2-dnf-plugins-core-4.0.2.2-3.el7_6.noarch requires python2-hawkey >= 0.7.0", "abrt-retrace-client-2.1.11-60.el7.centos.x86_64 requires abrt = 2.1.11-60.el7.centos", ], - frozenset( - ( - "redhat-lsb-trialuse-4.1-27.el7.centos.1.x86_64", - "python2-dnf-plugins-core-4.0.2.2-3.el7_6.noarch", - "abrt-retrace-client-2.1.11-60.el7.centos.x86_64", + list( + set( + [ + "redhat-lsb-trialuse-4.1-27.el7.centos.1.x86_64", + "python2-dnf-plugins-core-4.0.2.2-3.el7_6.noarch", + "abrt-retrace-client-2.1.11-60.el7.centos.x86_64", + ] ) ), ), # Random string - This might not happen that frequently. ( ["testing the test random string"], - frozenset(()), + [], ), ), )