From 28ac743e2684491bff335f891200f7903c04b4dc Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Tue, 29 May 2007 10:32:43 +0000 Subject: [PATCH] - plan_upgrade fix for installed but not dep satisfiying packages --- pisi/operations.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pisi/operations.py b/pisi/operations.py index 159e22e2..0dbe342b 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -537,9 +537,10 @@ def plan_upgrade(A, ignore_build = False): pkg = pisi.api.get_repo_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)