poldek: poldek/install3/conflicts.c - pkg_is_colored_like() tests ...

mis mis at pld-linux.org
Fri Jan 25 15:24:05 CET 2008


Author: mis                          Date: Fri Jan 25 14:24:05 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- pkg_is_colored_like() tests poldek_conf_MULTILIB

---- Files affected:
poldek/poldek/install3:
   conflicts.c (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: poldek/poldek/install3/conflicts.c
diff -u poldek/poldek/install3/conflicts.c:1.1 poldek/poldek/install3/conflicts.c:1.2
--- poldek/poldek/install3/conflicts.c:1.1	Wed Jan 23 23:56:19 2008
+++ poldek/poldek/install3/conflicts.c	Fri Jan 25 15:24:00 2008
@@ -184,7 +184,7 @@
         if (ht && n_hash_exists(ht, dbpkg->name))
             continue;
 
-        if (poldek_conf_MULTILIB && !pkg_is_colored_like(pkg, dbpkg))
+        if (!pkg_is_colored_like(pkg, dbpkg))
             continue;
                 
         if (pkg_match_req(dbpkg, cnfl, 1)) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/install3/conflicts.c?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list