From ef8762d5f0ac4f0169be8d1b5b00892425b9f9fb Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 26 Apr 2007 07:39:13 +0000 Subject: [PATCH] [MERGE] From-Import-Removal --- pisi/dependency.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pisi/dependency.py b/pisi/dependency.py index 99c79db5..a6388b33 100644 --- a/pisi/dependency.py +++ b/pisi/dependency.py @@ -18,7 +18,7 @@ _ = __trans.ugettext import pisi.context as ctx #import pisi.packagedb as packagedb -from pisi.version import Version +import pisi.version import pisi.pxml.autoxml as autoxml import pisi.itembyrepodb @@ -53,20 +53,20 @@ class Dependency: def satisfies(self, pkg_name, version, release): """determine if a package ver. satisfies given dependency spec""" ret = True - v = Version(version) + v = pisi.version.Version(version) if self.version: - ret &= v == Version(self.version) + ret &= v == pisi.version.Version(self.version) if self.versionFrom: - ret &= v >= Version(self.versionFrom) + ret &= v >= pisi.version.Version(self.versionFrom) if self.versionTo: - ret &= v <= Version(self.versionTo) - r = Version(release) + ret &= v <= pisi.version.Version(self.versionTo) + r = pisi.version.Version(release) if self.release: - ret &= r == Version(self.release) + ret &= r == pisi.version.Version(self.release) if self.releaseFrom: - ret &= r >= Version(self.releaseFrom) + ret &= r >= pisi.version.Version(self.releaseFrom) if self.releaseTo: - ret &= r <= Version(self.releaseTo) + ret &= r <= pisi.version.Version(self.releaseTo) return ret def dict_satisfies_dep(dict, depinfo):