From be46d8be577eb58f555a18548334ea9368efa93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Mon, 17 Oct 2005 20:29:40 +0000 Subject: [PATCH] * fix: releaseTo wasn't init correctly * simplify code a bit * identify bug with Version class --- pisi/dependency.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pisi/dependency.py b/pisi/dependency.py index 9bee0e09..5e622afe 100644 --- a/pisi/dependency.py +++ b/pisi/dependency.py @@ -35,7 +35,7 @@ class DepInfo: self.releaseTo = getNodeAttribute(node, "releaseTo") else: self.versionFrom = self.versionTo = None - self.releaseFrom = self.releaseFrom = None + self.releaseFrom = self.releaseTo = None def elt(self, xml): node = xml.newNode("Dependency") @@ -58,15 +58,15 @@ class DepInfo: def satisfies(self, pkg_name, version, release): """determine if a package ver. satisfies given dependency spec""" ret = True - from version import Version + v = Version(version) if self.versionFrom: - ret &= Version(version) >= Version(self.versionFrom) + ret &= v >= Version(self.versionFrom) if self.versionTo: - ret &= Version(version) <= Version(self.versionTo) + ret &= v <= Version(self.versionTo) if self.releaseFrom: - ret &= Version(release) <= Version(self.releaseFrom) + ret &= v <= Version(self.releaseFrom) if self.releaseTo: - ret &= Version(release) <= Version(self.releaseTo) + ret &= v <= Version(self.releaseTo) return ret def __str__(self):