From c653f91c4359893b5b0b165fbe168ce509d10020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Fri, 5 Aug 2005 02:59:18 +0000 Subject: [PATCH] Eray, please check DepInfo.satisfies for correctnes. In the old version it would only return False if the last control (releseTo) fails. I'm pretty sure this is not what you want. An other issue is pkg_name parameter. It isn't used in the function. --- pisi/specfile.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pisi/specfile.py b/pisi/specfile.py index 0a0dc204..2bf924b1 100644 --- a/pisi/specfile.py +++ b/pisi/specfile.py @@ -133,17 +133,22 @@ class DepInfo: def satisfies(self, pkg_name, version, release): """determine if a package ver. satisfies given dependency spec""" - ret = True from version import Version + if self.versionFrom: - ret &= Version(version) >= Version(depinfo.versionFrom) + ret &= Version(version) >= Version(self.versionFrom) + if not ret: return False if self.versionTo: - ret &= Version(version) <= Version(depinfo.versionTo) + ret &= Version(version) <= Version(self.versionTo) + if not ret: return False if self.releaseFrom: - ret &= Version(release) <= Version(depinfo.releaseFrom) + ret &= Version(release) <= Version(self.releaseFrom) + if not ret: return False if self.releaseTo: - ret &= Version(release) <= Version(depinfo.releaseTo) - return ret + ret &= Version(release) <= Version(self.releaseTo) + if not ret: return False + + return True def __str__(self): s = self.package