poldek: poldek/install3/mark.c, poldek/install3/install.c - group packages ...

[mis]

Author: mis                          Date: Sun May 11 22:05:01 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- group packages regardless their pkgdir (#83)

---- Files affected:
poldek/poldek/install3:
   mark.c (1.4 -> 1.5) , install.c (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: poldek/poldek/install3/mark.c
diff -u poldek/poldek/install3/mark.c:1.4 poldek/poldek/install3/mark.c:1.5
--- poldek/poldek/install3/mark.c:1.4	Wed Jan 30 23:13:42 2008
+++ poldek/poldek/install3/mark.c	Mon May 12 00:04:56 2008
@@ -87,8 +87,7 @@
 }
 
 
-int i3_mark_namegroup(struct i3ctx *ictx,
-                      struct pkg *pkg, tn_array *pkgs)
+int i3_mark_namegroup(struct i3ctx *ictx, struct pkg *pkg, tn_array *pkgs)
 {
     struct pkg tmpkg;
     int n, i, len, nmarked = 0;
@@ -103,14 +102,7 @@
     
     tmpkg.name = prefix;
 
-    //*p = '-';
     n = n_array_bsearch_idx_ex(pkgs, &tmpkg, (tn_fn_cmp)pkg_ncmp_name);
-    
-    
-    //if (n < 0 && p) {
-    //    n = n_array_bsearch_idx_ex(pkgs, &tmpkg, (tn_fn_cmp)pkg_cmp_name);
-    // }
-
     if (n < 0)
         return 0;
     
@@ -129,9 +121,6 @@
         if (!pkg_is_marked_i(ictx->ts->pms, p)) 
             continue;
         
-        if (pkg->pkgdir != p->pkgdir)
-            continue;
-
         if (!i3_is_marked(ictx, p)) {
             DBGF("mark %s\n", pkg_id(p));
             i3_mark_package(ictx, p, PKGMARK_MARK);

================================================================
Index: poldek/poldek/install3/install.c
diff -u poldek/poldek/install3/install.c:1.2 poldek/poldek/install3/install.c:1.3
--- poldek/poldek/install3/install.c:1.2	Wed Jan 30 22:29:35 2008
+++ poldek/poldek/install3/install.c	Mon May 12 00:04:56 2008
@@ -344,7 +344,7 @@
         i3_mark_package(&ictx, pkg, PKGMARK_MARK);
         
         if (ts->getop(ts, POLDEK_OP_PARTICLE)) {
-            i3_mark_namegroup(&ictx, pkg, pkg->pkgdir->pkgs);
+            i3_mark_namegroup(&ictx, pkg, ts->ctx->ps->pkgs);
             
             if (!do_install(&ictx))
                 nerr++;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/install3/mark.c?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/install3/install.c?r1=1.2&r2=1.3&f=u