[Uludag-commits] r14547 - branches/pisi-1.1/pisi

[uludag-commits at pardus.org.tr]

Author: faik
Date: Wed Jun 27 15:50:20 2007
New Revision: 14547

Modified:
   branches/pisi-1.1/pisi/conflict.py
   branches/pisi-1.1/pisi/relation.py
   branches/pisi-1.1/pisi/replace.py
Log:
- metaclass problem? cant get __str__ from parent.



Modified: branches/pisi-1.1/pisi/conflict.py
=================================================================
--- branches/pisi-1.1/pisi/conflict.py	(original)
+++ branches/pisi-1.1/pisi/conflict.py	Wed Jun 27 15:50:20 2007
@@ -20,7 +20,21 @@
 
 """ 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

Modified: branches/pisi-1.1/pisi/relation.py
=================================================================
--- branches/pisi-1.1/pisi/relation.py	(original)
+++ branches/pisi-1.1/pisi/relation.py	Wed Jun 27 15:50:20 2007
@@ -31,22 +31,6 @@
     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)

Modified: branches/pisi-1.1/pisi/replace.py
=================================================================
--- branches/pisi-1.1/pisi/replace.py	(original)
+++ branches/pisi-1.1/pisi/replace.py	Wed Jun 27 15:50:20 2007
@@ -18,7 +18,21 @@
 
 """ 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