install dependency artık yok...
This commit is contained in:
+1
-10
@@ -19,15 +19,6 @@ def satisfiesDep(pkg, depinfo):
|
|||||||
ret &= Version(version) <= Version(depinfo.versionTo)
|
ret &= Version(version) <= Version(depinfo.versionTo)
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
def installDeps(pkg):
|
|
||||||
return packagedb.get_package(pkg).installDeps
|
|
||||||
|
|
||||||
def satisfiesInstallDeps(pkg):
|
|
||||||
deps = installDeps(pkg)
|
|
||||||
# print 'installdeps = ', deps
|
|
||||||
return reduce(lambda x,y:x and y,
|
|
||||||
map(lambda x: satisfiesDep(pkg, x), deps),True)
|
|
||||||
|
|
||||||
def runtimeDeps(pkg):
|
def runtimeDeps(pkg):
|
||||||
return packagedb.get_package(pkg).runtimeDeps
|
return packagedb.get_package(pkg).runtimeDeps
|
||||||
|
|
||||||
@@ -43,7 +34,7 @@ def installable(pkg):
|
|||||||
if not packagedb.has_package(pkg):
|
if not packagedb.has_package(pkg):
|
||||||
ui.info("package " + pkg + " is not present in the package database\n");
|
ui.info("package " + pkg + " is not present in the package database\n");
|
||||||
return False
|
return False
|
||||||
elif satisfiesRuntimeDeps(pkg) and satisfiesInstallDeps(pkg):
|
elif satisfiesRuntimeDeps(pkg):
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
ui.info("package " + pkg + " does not satisfy dependencies\n");
|
ui.info("package " + pkg + " does not satisfy dependencies\n");
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ class MetaData(XmlFile):
|
|||||||
self.package.isa = pkg.isa
|
self.package.isa = pkg.isa
|
||||||
self.package.partof = pkg.partof
|
self.package.partof = pkg.partof
|
||||||
self.package.license = pkg.license
|
self.package.license = pkg.license
|
||||||
self.package.installDeps = pkg.installDeps
|
|
||||||
self.package.runtimeDeps = pkg.runtimeDeps
|
self.package.runtimeDeps = pkg.runtimeDeps
|
||||||
self.package.paths = pkg.paths
|
self.package.paths = pkg.paths
|
||||||
self.package.history = src.history # FIXME
|
self.package.history = src.history # FIXME
|
||||||
|
|||||||
@@ -230,8 +230,6 @@ class PackageInfo(object):
|
|||||||
self.isa = map(getNodeText, getAllNodes(node, "IsA"))
|
self.isa = map(getNodeText, getAllNodes(node, "IsA"))
|
||||||
self.partof = getNodeText(node, "PartOf")
|
self.partof = getNodeText(node, "PartOf")
|
||||||
self.license = map(getNodeText, getAllNodes(node, "License"))
|
self.license = map(getNodeText, getAllNodes(node, "License"))
|
||||||
iDepElts = getAllNodes(node, "InstallDependencies/Dependency")
|
|
||||||
self.installDeps = [DepInfo(x) for x in iDepElts]
|
|
||||||
rtDepElts = getAllNodes(node, "RuntimeDependencies/Dependency")
|
rtDepElts = getAllNodes(node, "RuntimeDependencies/Dependency")
|
||||||
self.runtimeDeps = [DepInfo(x) for x in rtDepElts]
|
self.runtimeDeps = [DepInfo(x) for x in rtDepElts]
|
||||||
self.paths = [PathInfo(x) for x in getAllNodes(node, "Files/Path")]
|
self.paths = [PathInfo(x) for x in getAllNodes(node, "Files/Path")]
|
||||||
@@ -255,8 +253,6 @@ class PackageInfo(object):
|
|||||||
xml.addTextNodeUnder(node, "IsA", isa)
|
xml.addTextNodeUnder(node, "IsA", isa)
|
||||||
if self.partof:
|
if self.partof:
|
||||||
xml.addTextNodeUnder(node, "PartOf", self.partof)
|
xml.addTextNodeUnder(node, "PartOf", self.partof)
|
||||||
for dep in self.installDeps:
|
|
||||||
xml.addNodeUnder(node, "InstallDependencies", dep.elt(xml))
|
|
||||||
for dep in self.runtimeDeps:
|
for dep in self.runtimeDeps:
|
||||||
xml.addNodeUnder(node, "RuntimeDependencies", dep.elt(xml))
|
xml.addNodeUnder(node, "RuntimeDependencies", dep.elt(xml))
|
||||||
for path in self.paths:
|
for path in self.paths:
|
||||||
@@ -280,8 +276,6 @@ class PackageInfo(object):
|
|||||||
|
|
||||||
for path in self.paths:
|
for path in self.paths:
|
||||||
if not path.verify(): return False
|
if not path.verify(): return False
|
||||||
for dep in self.installDeps:
|
|
||||||
if not dep.verify(): return False
|
|
||||||
for dep in self.runtimeDeps:
|
for dep in self.runtimeDeps:
|
||||||
if not dep.verify(): return False
|
if not dep.verify(): return False
|
||||||
return True
|
return True
|
||||||
|
|||||||
Reference in New Issue
Block a user