Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert and kill eager. this original code is much more tested.

Browse Source 
Anyway, these were the dangerous zones. :)

You are safe now!
This commit is contained in:
Faik Uygur
2006-11-23 09:10:29 +00:00
parent efe2c75084
commit bcafc3b1d3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/operations.py
+6 -3
View File
@@ -521,7 +521,7 @@ def plan_upgrade(A, ignore_build = False):
# add packages that can be upgraded # add packages that can be upgraded
if dependency.repo_satisfies_dep(dep): if dependency.repo_satisfies_dep(dep):
if ctx.installdb.is_installed(dep.package): if ctx.installdb.is_installed(dep.package):
if not is_upgradable(dep.package): if dependency.installed_satisfies_dep(dep):
continue continue
if not dep.package in G_f.vertices(): if not dep.package in G_f.vertices():
Bp.add(str(dep.package)) Bp.add(str(dep.package))
@@ -539,8 +539,11 @@ def plan_upgrade(A, ignore_build = False):
pkg = packagedb.get_package(x) pkg = packagedb.get_package(x)
rev_deps = packagedb.get_rev_deps(x) rev_deps = packagedb.get_rev_deps(x)
for (rev_dep, depinfo) in rev_deps: for (rev_dep, depinfo) in rev_deps:
# add all upgradable reverse deps # add only installed but unsatisfied reverse dependencies
if is_upgradable(rev_dep): if ctx.installdb.is_installed(rev_dep) and \
(not dependency.installed_satisfies_dep(depinfo)):
if not dependency.repo_satisfies_dep(depinfo):
raise Error(_('Reverse dependency %s of %s cannot be satisfied') % (rev_dep, x))
if not rev_dep in G_f.vertices(): if not rev_dep in G_f.vertices():
Bp.add(rev_dep) Bp.add(rev_dep)
G_f.add_plain_dep(rev_dep, x) G_f.add_plain_dep(rev_dep, x)