poldek: poldek/install/obsoletes.c, poldek/install/requirements.c ...

[mis]

Author: mis                          Date: Sun Jun 17 20:29:58 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- more comments

---- Files affected:
poldek/poldek/install:
   obsoletes.c (1.8 -> 1.9) , requirements.c (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: poldek/poldek/install/obsoletes.c
diff -u poldek/poldek/install/obsoletes.c:1.8 poldek/poldek/install/obsoletes.c:1.9
--- poldek/poldek/install/obsoletes.c:1.8	Sun Jun 17 22:24:47 2007
+++ poldek/poldek/install/obsoletes.c	Sun Jun 17 22:29:53 2007
@@ -115,7 +115,7 @@
         return 1;
     }
     
-    DBG("spkg %s\n", db_dep->spkg ? pkg_id(db_dep->spkg) : "NO");
+    DBG("  spkg %s\n", db_dep->spkg ? pkg_id(db_dep->spkg) : "NO");
     req = db_dep->req;
 
     // still satisfied by db? 

================================================================
Index: poldek/poldek/install/requirements.c
diff -u poldek/poldek/install/requirements.c:1.6 poldek/poldek/install/requirements.c:1.7
--- poldek/poldek/install/requirements.c:1.6	Sun Jun 17 22:24:47 2007
+++ poldek/poldek/install/requirements.c	Sun Jun 17 22:29:53 2007
@@ -28,22 +28,22 @@
         return NULL;
     
     best_i = in_select_best_pkg(ictx, pkg, pkgs);
-    if (best_i == -1) {           /* possible in multilib mode */
+    if (best_i == -1) {           /* can happens in multilib mode */
         n_array_free(pkgs);
         return NULL;
     }
-    
+
     for (i=best_i; i < n_array_size(pkgs); i++) {
         struct pkg *p = n_array_nth(pkgs, i);
             
         if (strcmp(pkg->name, p->name) == 0)
             continue;
-
-        if (poldek_conf_MULTILIB && 0) {
+#if 0                           /* needless here */
+        if (poldek_conf_MULTILIB) {
             if (!pkg_is_colored_like(p, pkg))
                 continue;
         }
-            
+#end            
         DBGF("found %s <- %s, %d, %d\n", pkg_id(pkg),
              pkg_id(p),
              pkg_caps_obsoletes_pkg_caps(p, pkg), 
================================================================

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