upgrade: Check if the conflicting package is already in the upgrade list

2010-07-16 06:52:17 +00:00
parent 8328e4033b
commit d542fa7a40
1 changed files with 4 additions and 0 deletions
@@ -270,6 +270,10 @@ def plan_upgrade(A, force_replaced=True, replaces=None):
        does not conflict with the new version of A, add A to the upgrade list.
        """
        for conflict in pkg.conflicts:
+            if conflict.package in G_f.vertices():
+                # Conflicting package is already in the upgrade list.
+                continue
+
            if not pisi.conflict.installed_package_conflicts(conflict):
                # Conflicting package is not installed.
                # No need to deal with it.