upgrade: Take all deps into account for the correct upgrade order

This commit gets back the old logic changed by the recent commits.
2010-03-22 22:17:58 +00:00
parent c4534dec08
commit f8fe17886e
1 changed files with 6 additions and 1 deletions
@@ -255,7 +255,12 @@ def plan_upgrade(A, force_replaced=True, replaces=None):
            if dep.satisfied_by_repo():
                if not dep.package in G_f.vertices():
                    Bp.add(str(dep.package))
-                    G_f.add_dep(pkg.name, dep)
+
+                # Always add the dependency info although the dependant
+                # package is already a member of this graph. Upgrade order
+                # might change if the dependency info differs from the
+                # previous ones.
+                G_f.add_dep(pkg.name, dep)
            else:
                ctx.ui.error(_('Dependency %s of %s cannot be satisfied') % (dep, pkg.name))
                raise Exception(_("Upgrade is not possible."))