- metaclass problem? cant get __str__ from parent.
This commit is contained in:
+15
-1
@@ -20,7 +20,21 @@ import pisi.relation
|
|||||||
|
|
||||||
""" Conflict relation """
|
""" Conflict relation """
|
||||||
class Conflict(pisi.relation.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):
|
def installed_package_conflicts(confinfo):
|
||||||
"""determine if an installed package in *repository* conflicts with
|
"""determine if an installed package in *repository* conflicts with
|
||||||
|
|||||||
@@ -31,22 +31,6 @@ class Relation:
|
|||||||
a_releaseFrom = [autoxml.String, autoxml.optional]
|
a_releaseFrom = [autoxml.String, autoxml.optional]
|
||||||
a_releaseTo = [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):
|
def satisfies_relation(self, pkg_name, version, release):
|
||||||
ret = True
|
ret = True
|
||||||
v = pisi.version.Version(version)
|
v = pisi.version.Version(version)
|
||||||
|
|||||||
+15
-1
@@ -18,7 +18,21 @@ import pisi.relation
|
|||||||
|
|
||||||
""" Replace relation """
|
""" Replace relation """
|
||||||
class Replace(pisi.relation.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):
|
def installed_package_replaced(repinfo):
|
||||||
"""determine if an installed package in *repository* replaced with
|
"""determine if an installed package in *repository* replaced with
|
||||||
|
|||||||
Reference in New Issue
Block a user