poldek: poldek/pkgcmp.c - sort by name,arch,evr in multilib mode

[mis]

Author: mis                          Date: Tue Jun 19 14:15:47 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- sort by name,arch,evr in multilib mode

---- Files affected:
poldek/poldek:
   pkgcmp.c (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: poldek/poldek/pkgcmp.c
diff -u poldek/poldek/pkgcmp.c:1.9 poldek/poldek/pkgcmp.c:1.10
--- poldek/poldek/pkgcmp.c:1.9	Sun Jun 17 22:24:47 2007
+++ poldek/poldek/pkgcmp.c	Tue Jun 19 16:15:42 2007
@@ -163,12 +163,12 @@
 
     if ((rc = pkg_cmp_name(p1, p2)))
         return rc;
-    
-    if ((rc = -pkg_cmp_evr(p1, p2)))
-        return rc;
 
-    if (poldek_conf_MULTILIB)
-        rc = -pkg_cmp_arch(p1, p2);
+    /* if multilib sort by name, arch, evr */
+    if (poldek_conf_MULTILIB && (rc = -pkg_cmp_arch(p1, p2)) != 0) 
+        return rc;
+    
+    rc = -pkg_cmp_evr(p1, p2);
 
     //printf("cmp %s %s -> %d\n", pkg_snprintf_s(p1), pkg_snprintf_s0(p2), rc);
     return rc;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/poldek/poldek/pkgcmp.c?r1=1.9&r2=1.10&f=u