poldek: poldek/install/install.c - "upgrade lib*, nothing to do" b...

[mis]

Author: mis                          Date: Mon Jun 18 16:12:48 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- "upgrade lib*, nothing to do" bugfix

---- Files affected:
poldek/poldek/install:
   install.c (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: poldek/poldek/install/install.c
diff -u poldek/poldek/install/install.c:1.6 poldek/poldek/install/install.c:1.7
--- poldek/poldek/install/install.c:1.6	Sun Jun 17 22:24:47 2007
+++ poldek/poldek/install/install.c	Mon Jun 18 18:12:43 2007
@@ -315,7 +315,8 @@
 {
     struct pkg *pkg, *pkg2;
     int i, n, nmarked = 0;
-    
+    int multilib = poldek_conf_MULTILIB; /* just for short */
+
     if (n_array_size(pkgs) < 2)
         return n_array_size(pkgs);
     
@@ -334,14 +335,16 @@
         
         if (i == n_array_size(pkgs))
             break;
-        
+
         pkg2 = n_array_nth(pkgs, i);
         while (pkg_cmp_name(pkg, pkg2) == 0) {
-            pkg_unmark(pms, pkg2);
-            DBGF("unmark %s\n", pkg_id(pkg2));
-
+            if (!multilib || (multilib && pkg_cmp_arch(pkg, pkg2) == 0)) {
+                pkg_unmark(pms, pkg2);
+                DBGF("unmark %s\n", pkg_id(pkg2));
+                n++;
+            }
+            
             i++;
-            n++;
             if (i == n_array_size(pkgs))
                 break;
             pkg2 = n_array_nth(pkgs, i);
================================================================

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