- plan_upgrade fix for installed but not dep satisfiying packages

2007-05-29 10:34:30 +00:00
parent 5545736ba6
commit 55e51f310f
1 changed files with 4 additions and 3 deletions
@@ -535,9 +535,10 @@ def plan_upgrade(A):
            pkg = packagedb.get_package(x)
            for dep in pkg.runtimeDependencies():
                # add packages that can be upgraded
-                if dependency.repo_satisfies_dep(dep) or ctx.installdb.is_installed(dep.package):
-                    if dependency.installed_satisfies_dep(dep):
-                        continue
+                if ctx.installdb.is_installed(dep.package) and dependency.installed_satisfies_dep(dep):
+                    continue
+                
+                if dependency.repo_satisfies_dep(dep):
                    if not dep.package in G_f.vertices():
                        Bp.add(str(dep.package))
                    G_f.add_dep(x, dep)