From 02cd23076e6fe59b879862116cdcdba2b052b6af Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Sat, 9 Dec 2006 14:51:42 +0000 Subject: [PATCH] * because of these it does not seem to be providing enough info. --- pisi/conflict.py | 4 ++++ pisi/dependency.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pisi/conflict.py b/pisi/conflict.py index cdb6366d..edd1b148 100644 --- a/pisi/conflict.py +++ b/pisi/conflict.py @@ -39,10 +39,14 @@ class Conflict: s += _(" version >= ") + self.versionFrom if self.versionTo: s += _(" version <= ") + self.versionTo + if self.version: + s += _(" version ") + self.version if self.releaseFrom: s += _(" release >= ") + self.releaseFrom if self.releaseTo: s += _(" release <= ") + self.releaseTo + if self.release: + s += _(" release ") + self.release return s def conflicts(self, pkg_name, version, release): diff --git a/pisi/dependency.py b/pisi/dependency.py index a33df4ea..416a6360 100644 --- a/pisi/dependency.py +++ b/pisi/dependency.py @@ -40,10 +40,14 @@ class Dependency: s += _(" version >= ") + self.versionFrom if self.versionTo: s += _(" version <= ") + self.versionTo + if self.version: + s += _(" version ") + self.version if self.releaseFrom: s += _(" release >= ") + self.releaseFrom if self.releaseTo: s += _(" release <= ") + self.releaseTo + if self.release: + s += _(" release ") + self.release return s def satisfies(self, pkg_name, version, release):