diff --git a/pisi/conflict.py b/pisi/conflict.py index b491b968..6b3032cf 100644 --- a/pisi/conflict.py +++ b/pisi/conflict.py @@ -20,7 +20,21 @@ import pisi.relation """ Conflict relation """ class Conflict(pisi.relation.Relation): - pass + def __str__(self): + s = self.package + if self.versionFrom: + 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 installed_package_conflicts(confinfo): """determine if an installed package in *repository* conflicts with diff --git a/pisi/relation.py b/pisi/relation.py index 41aeda5f..8a478076 100644 --- a/pisi/relation.py +++ b/pisi/relation.py @@ -31,22 +31,6 @@ class Relation: a_releaseFrom = [autoxml.String, autoxml.optional] a_releaseTo = [autoxml.String, autoxml.optional] - def __str__(self): - s = self.package - if self.versionFrom: - 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_relation(self, pkg_name, version, release): ret = True v = pisi.version.Version(version) diff --git a/pisi/replace.py b/pisi/replace.py index 9817effd..373d294c 100644 --- a/pisi/replace.py +++ b/pisi/replace.py @@ -18,7 +18,21 @@ import pisi.relation """ Replace relation """ class Replace(pisi.relation.Relation): - pass + def __str__(self): + s = self.package + if self.versionFrom: + 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 installed_package_replaced(repinfo): """determine if an installed package in *repository* replaced with