poldek: poldek/pkgcmp.c - multilib: use arch for non-colored packages

[mis]

Author: mis                          Date: Sat Jun 16 17:03:27 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- multilib: use arch for non-colored packages

---- Files affected:
poldek/poldek:
   pkgcmp.c (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: poldek/poldek/pkgcmp.c
diff -u poldek/poldek/pkgcmp.c:1.7 poldek/poldek/pkgcmp.c:1.8
--- poldek/poldek/pkgcmp.c:1.7	Sat Jun 16 17:20:04 2007
+++ poldek/poldek/pkgcmp.c	Sat Jun 16 19:03:22 2007
@@ -55,20 +55,25 @@
 
 int pkg_is_colored_like(const struct pkg *candidate, const struct pkg *pkg)
 {
-    int rc = 0;
+    int rc = -1;
+
+    if (!poldek_conf_MULTILIB)
+        return 1;
 
     if (pkg->color && candidate->color)
         rc = pkg->color & candidate->color;
-    else
-        rc = 1;                 /* rpm assumes this */
-    
-    if (rc && pkg_cmp_arch(pkg, candidate) == 0) {
+
+    if (rc == -1 && pkg_cmp_arch(pkg, candidate) == 0) { /* no color? use arch */
         rc = 1;
 #if ENABLE_TRACE        
         DBGF("%s(c=%d), %s(c=%d) => YES\n", pkg_id(candidate),
              candidate->color, pkg_id(pkg), pkg->color);
 #endif
     }
+
+    if (rc == -1)
+        rc = 0;
+    
     return rc;
 }
 
================================================================

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