From 5545736ba63c4be606e8695a4633f50538748758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 28 May 2007 20:30:33 +0000 Subject: [PATCH] [merge] use both db's for dep. checking --- pisi/operations.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pisi/operations.py b/pisi/operations.py index f0110eb3..f01677e4 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -535,10 +535,9 @@ 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): - if ctx.installdb.is_installed(dep.package): - if dependency.installed_satisfies_dep(dep): - continue + if dependency.repo_satisfies_dep(dep) or ctx.installdb.is_installed(dep.package): + if dependency.installed_satisfies_dep(dep): + continue if not dep.package in G_f.vertices(): Bp.add(str(dep.package)) G_f.add_dep(x, dep)