* fix: upgradableDep testini kullanmak yanlis. paketin upgrade
tarafindan install edilmesi icin illa install edilmis olmasi gerekmez.
This commit is contained in:
@@ -96,21 +96,6 @@ dependency spec"""
|
|||||||
(version, release) = (pkg.version, pkg.release)
|
(version, release) = (pkg.version, pkg.release)
|
||||||
return depinfo.satisfies(pkg_name, version, release)
|
return depinfo.satisfies(pkg_name, version, release)
|
||||||
|
|
||||||
def upgradableDep(depinfo):
|
|
||||||
"""determine if an *already installed* package can be upgraded given dependency spec in installdb"""
|
|
||||||
if not installdb.is_installed(depinfo.package):
|
|
||||||
return False
|
|
||||||
else:
|
|
||||||
pkg = packagedb.get_package(pkg_name)
|
|
||||||
(version, release) = (pkg.version, pkg.release)
|
|
||||||
return depinfo.satisfies(pkg_name, version, release)
|
|
||||||
## pkg_name = depinfo.package
|
|
||||||
## pkg = packagedb.inst_packagedb.get_package(pkg_name)
|
|
||||||
## (version, release) = (pkg.version, pkg.release)
|
|
||||||
## pkg_then = packagedb.get_package(pkg_name)
|
|
||||||
## (version_then, release_then) = (pkg_then.version, pkg_then.release)
|
|
||||||
## return depinfo.upgradable(pkg_name, release, release_then)
|
|
||||||
|
|
||||||
def satisfiesDeps(pkg, deps, sat = installedSatisfiesDep):
|
def satisfiesDeps(pkg, deps, sat = installedSatisfiesDep):
|
||||||
for dep in deps:
|
for dep in deps:
|
||||||
if not sat(dep):
|
if not sat(dep):
|
||||||
|
|||||||
+1
-1
@@ -184,7 +184,7 @@ def upgrade_pkg_names(A):
|
|||||||
for dep in pkg.runtimeDeps:
|
for dep in pkg.runtimeDeps:
|
||||||
print 'checking ', dep
|
print 'checking ', dep
|
||||||
# add packages that can be upgraded
|
# add packages that can be upgraded
|
||||||
if not dependency.upgradableDep(dep):
|
if not dependency.repoSatisfiesDep(dep):
|
||||||
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))
|
||||||
G_f.add_dep(x, dep)
|
G_f.add_dep(x, dep)
|
||||||
|
|||||||
Reference in New Issue
Block a user