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.
This commit is contained in:
Barış Metin
2005-08-05 02:59:18 +00:00
parent bfd9d6169f
commit c653f91c43
+11 -6
View File
@@ -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