diff --git a/pisi/dependency.py b/pisi/dependency.py index ff570ea1..52e5f534 100644 --- a/pisi/dependency.py +++ b/pisi/dependency.py @@ -19,15 +19,6 @@ def satisfiesDep(pkg, depinfo): ret &= Version(version) <= Version(depinfo.versionTo) 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): return packagedb.get_package(pkg).runtimeDeps @@ -43,7 +34,7 @@ def installable(pkg): if not packagedb.has_package(pkg): ui.info("package " + pkg + " is not present in the package database\n"); return False - elif satisfiesRuntimeDeps(pkg) and satisfiesInstallDeps(pkg): + elif satisfiesRuntimeDeps(pkg): return True else: ui.info("package " + pkg + " does not satisfy dependencies\n"); diff --git a/pisi/metadata.py b/pisi/metadata.py index be908730..e0d84084 100644 --- a/pisi/metadata.py +++ b/pisi/metadata.py @@ -75,7 +75,6 @@ class MetaData(XmlFile): self.package.isa = pkg.isa self.package.partof = pkg.partof self.package.license = pkg.license - self.package.installDeps = pkg.installDeps self.package.runtimeDeps = pkg.runtimeDeps self.package.paths = pkg.paths self.package.history = src.history # FIXME diff --git a/pisi/specfile.py b/pisi/specfile.py index b58a3cdc..874e4ace 100644 --- a/pisi/specfile.py +++ b/pisi/specfile.py @@ -230,8 +230,6 @@ class PackageInfo(object): self.isa = map(getNodeText, getAllNodes(node, "IsA")) self.partof = getNodeText(node, "PartOf") 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") self.runtimeDeps = [DepInfo(x) for x in rtDepElts] self.paths = [PathInfo(x) for x in getAllNodes(node, "Files/Path")] @@ -255,8 +253,6 @@ class PackageInfo(object): xml.addTextNodeUnder(node, "IsA", isa) if 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: xml.addNodeUnder(node, "RuntimeDependencies", dep.elt(xml)) for path in self.paths: @@ -280,8 +276,6 @@ class PackageInfo(object): for path in self.paths: if not path.verify(): return False - for dep in self.installDeps: - if not dep.verify(): return False for dep in self.runtimeDeps: if not dep.verify(): return False return True