Create proper sorting and package selection for same packages in different repositories.

diff --git a/pakfire/packages/base.py b/pakfire/packages/base.py
index d6c0dcf6250be90143ecf25658bba91829708f4a..5a562c3f0f0522bee4a0c36505189dab1066e4f6 100644 (file)
--- a/pakfire/packages/base.py
+++ b/pakfire/packages/base.py
@@ -33,6 +33,10 @@ class Package(object):
                #elif ret > 0:
                #       logging.debug("%s is more recent than %s" % (self, other))
 
+               # If no rank could be created, sort by repository priority
+               if not ret:
+                       ret = cmp(self.repo, other.repo)
+
                return ret
 
        def dump(self, short=False):

diff --git a/pakfire/repository.py b/pakfire/repository.py
index 79f85f787809dfc0a6099232245bb5b3a39d4935..e17d72d9c2c6af7ce5b5734dd8c79e0db151da75 100644 (file)
--- a/pakfire/repository.py
+++ b/pakfire/repository.py
@@ -142,7 +142,8 @@ class RepositoryFactory(object):
                return "<%s %s>" % (self.__class__.__name__, self.name)
 
        def __cmp__(self, other):
-               return cmp(self.priority, other.priority) or cmp(self.name, other.name)
+               return cmp(self.priority * -1, other.priority * -1) or \
+                       cmp(self.name, other.name)
 
        @property
        def priority(self):