From-Import-Removal

This commit is contained in:
Faik Uygur
2007-04-26 07:38:17 +00:00
parent 1e387dbed2
commit 40940f4009
+9 -9
View File
@@ -19,7 +19,7 @@ _ = __trans.ugettext
import pisi import pisi
import pisi.context as ctx import pisi.context as ctx
import pisi.db.packagedb as packagedb import pisi.db.packagedb as packagedb
from pisi.version import Version import pisi.version
import pisi.pxml.autoxml as autoxml import pisi.pxml.autoxml as autoxml
import pisi.db.itembyrepodb import pisi.db.itembyrepodb
@@ -54,20 +54,20 @@ class Dependency:
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
v = Version(version) v = pisi.version.Version(version)
if self.version: if self.version:
ret &= v == Version(self.version) ret &= v == pisi.version.Version(self.version)
if self.versionFrom: if self.versionFrom:
ret &= v >= Version(self.versionFrom) ret &= v >= pisi.version.Version(self.versionFrom)
if self.versionTo: if self.versionTo:
ret &= v <= Version(self.versionTo) ret &= v <= pisi.version.Version(self.versionTo)
r = Version(release) r = pisi.version.Version(release)
if self.release: if self.release:
ret &= r == Version(self.release) ret &= r == pisi.version.Version(self.release)
if self.releaseFrom: if self.releaseFrom:
ret &= r >= Version(self.releaseFrom) ret &= r >= pisi.version.Version(self.releaseFrom)
if self.releaseTo: if self.releaseTo:
ret &= r <= Version(self.releaseTo) ret &= r <= pisi.version.Version(self.releaseTo)
return ret return ret
def dict_satisfies_dep(dict, depinfo): def dict_satisfies_dep(dict, depinfo):