[merge] use both db's for dep. checking

2007-05-28 20:30:33 +00:00
parent 6804eb11a9
commit 5545736ba6
1 changed files with 3 additions and 4 deletions
@@ -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)