Enhanced system.sort_package_list to also sort CPVs

5 files changed, 38 insertions, 27 deletions

diff --git a/portato/backend/package.py b/portato/backend/package.py
index 8a80fd5..c085816 100644
--- a/portato/backend/package.py
+++ b/portato/backend/package.py
@@ -371,16 +371,6 @@ class Package (_Package):
         
         raise NotImplementedError
 
-    def compare_version(self, other):
-        """Compares this package's version to another's CPV; returns -1, 0, 1.
-        
-        @param other: the other package
-        @type other: Package
-        @returns: -1, 0 or 1
-        @rtype: int"""
-
-        raise NotImplementedError
-
     def matches (self, criterion):
         """This checks, whether this package matches a specific versioning criterion - e.g.: "<=net-im/foobar-1.2".
         
diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py
index 2b40e41..79af79b 100644
--- a/portato/backend/portage/package.py
+++ b/portato/backend/portage/package.py
@@ -294,18 +294,8 @@ class PortagePackage (Package):
             return self.get_package_settings("USE", installed = True).split()
         else: return []
 
-    def compare_version(self,other):
-        v1 = self._scpv
-        v2 = portage.catpkgsplit(other.get_cpv())
-        # if category is different
-        if v1[0] != v2[0]:
-            return cmp(v1[0],v2[0])
-        # if name is different
-        elif v1[1] != v2[1]:
-            return cmp(v1[1],v2[1])
-        # Compare versions
-        else:
-            return portage.pkgcmp(v1[1:],v2[1:])
+    def __cmp__ (self, other):
+        return system.compare_versions(self.get_cpv(), other.get_cpv())
 
     def matches (self, criterion):
         # cpv_matches needs explicit slot info
diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py
index d7c7806..83eb37a 100644
--- a/portato/backend/portage/system.py
+++ b/portato/backend/portage/system.py
@@ -120,6 +120,20 @@ class PortageSystem (SystemInterface):
         else:
             return True
 
+    def compare_versions(self, v1, v2):
+        v1 = self.split_cpv(v1)
+        v2 = self.split_cpv(v2)
+
+        # if category is different
+        if v1[0] != v2[0]:
+            return cmp(v1[0],v2[0])
+        # if name is different
+        elif v1[1] != v2[1]:
+            return cmp(v1[1],v2[1])
+        # Compare versions
+        else:
+            return portage.pkgcmp(v1[1:],v2[1:])
+
     def with_bdeps(self):
         """Returns whether the "--with-bdeps" option is set to true.
 
@@ -218,8 +232,11 @@ class PortageSystem (SystemInterface):
         cpv = portage.dep_getcpv(cpv)
         return portage.catpkgsplit(cpv)
 
-    def sort_package_list(self, pkglist):
-        pkglist.sort(PortagePackage.compare_version) # XXX: waaah ... direct package naming... =/
+    def sort_package_list(self, pkglist, only_cpv = False):
+        if only_cpv:
+            pkglist.sort(self.compare_versions)
+        else:
+            pkglist.sort()
         return pkglist
 
     def reload_settings (self):
diff --git a/portato/backend/system_interface.py b/portato/backend/system_interface.py
index be79de2..f0bfdf6 100644
--- a/portato/backend/system_interface.py
+++ b/portato/backend/system_interface.py
@@ -68,6 +68,18 @@ class SystemInterface (object):
         """
 
         raise NotImplementedError
+
+    def compare_versions(self, v1, v2):
+        """Compares two CPVs; returns -1, 0, 1.
+        
+        @param v1: one CPV
+        @type v1: cpv
+        @param v2: the second CPV
+        @type v2: cpv
+        @returns: -1, 0 or 1
+        @rtype: int"""
+
+        raise NotImplementedError
     
     def find_best(self, list, only_cpv = False):
         """Returns the best package out of a list of packages.
@@ -134,11 +146,13 @@ class SystemInterface (object):
 
         raise NotImplementedError
 
-    def sort_package_list(self, pkglist):
+    def sort_package_list(self, pkglist, only_cpv = False):
         """Sorts a package list in the same manner portage does.
         
         @param pkglist: list to sort
-        @type pkglist: Packages[]
+        @type pkglist: Packages[] or cpv[]
+        @param only_cpv: flags whether the passed list consists of Packages or of CPVs
+        @type: bool
         """
 
         raise NotImplementedError
diff --git a/portato/gui/queue.py b/portato/gui/queue.py
index e73891d..6d3d19d 100644
--- a/portato/gui/queue.py
+++ b/portato/gui/queue.py
@@ -144,7 +144,7 @@ class EmergeQueue:
                 old = system.find_packages(pkg.get_slot_cp(), system.SET_INSTALLED)
                 if old:
                     old = old[0] # assume we have only one there
-                    cmp = pkg.compare_version(old)
+                    cmp = pkg.__cmp__(old)
                     if cmp > 0:
                         update = True
                     elif cmp < 0: