From 8603c765cea721c5ff6efe970ccceef8a7e8faf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Fri, 5 Aug 2005 03:08:08 +0000 Subject: [PATCH] Damn!... It's my fault. I haven't realized that bitwise magic. Reverting the previous commit. Need to go to sleep :(. --- pisi/specfile.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pisi/specfile.py b/pisi/specfile.py index 2bf924b1..0a0dc204 100644 --- a/pisi/specfile.py +++ b/pisi/specfile.py @@ -133,22 +133,17 @@ 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(self.versionFrom) - if not ret: return False + ret &= Version(version) >= Version(depinfo.versionFrom) if self.versionTo: - ret &= Version(version) <= Version(self.versionTo) - if not ret: return False + ret &= Version(version) <= Version(depinfo.versionTo) if self.releaseFrom: - ret &= Version(release) <= Version(self.releaseFrom) - if not ret: return False + ret &= Version(release) <= Version(depinfo.releaseFrom) if self.releaseTo: - ret &= Version(release) <= Version(self.releaseTo) - if not ret: return False - - return True + ret &= Version(release) <= Version(depinfo.releaseTo) + return ret def __str__(self): s = self.package