Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix: releaseTo wasn't init correctly

Browse Source 
* simplify code a bit
* identify bug with Version class
This commit is contained in:
Eray Özkural
2005-10-17 20:29:40 +00:00
parent 5f1bdf1715
commit be46d8be57
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/dependency.py
+6 -6
View File
@@ -35,7 +35,7 @@ class DepInfo:
self.releaseTo = getNodeAttribute(node, "releaseTo") self.releaseTo = getNodeAttribute(node, "releaseTo")
else: else:
self.versionFrom = self.versionTo = None self.versionFrom = self.versionTo = None
self.releaseFrom = self.releaseFrom = None self.releaseFrom = self.releaseTo = None
def elt(self, xml): def elt(self, xml):
node = xml.newNode("Dependency") node = xml.newNode("Dependency")
@@ -58,15 +58,15 @@ class DepInfo:
def satisfies(self, pkg_name, version, release): def satisfies(self, pkg_name, version, release):
"""determine if a package ver. satisfies given dependency spec""" """determine if a package ver. satisfies given dependency spec"""
ret = True ret = True
from version import Version v = Version(version)
if self.versionFrom: if self.versionFrom:
ret &= Version(version) >= Version(self.versionFrom) ret &= v >= Version(self.versionFrom)
if self.versionTo: if self.versionTo:
ret &= Version(version) <= Version(self.versionTo) ret &= v <= Version(self.versionTo)
if self.releaseFrom: if self.releaseFrom:
ret &= Version(release) <= Version(self.releaseFrom) ret &= v <= Version(self.releaseFrom)
if self.releaseTo: if self.releaseTo:
ret &= Version(release) <= Version(self.releaseTo) ret &= v <= Version(self.releaseTo)
return ret return ret
def __str__(self): def __str__(self):