poldek: poldek/pkgdir/dir/dir.c - auto PKGDIR_LD_DESC

[mis]

Author: mis                          Date: Fri Jun 22 12:43:38 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- auto PKGDIR_LD_DESC

---- Files affected:
poldek/poldek/pkgdir/dir:
   dir.c (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: poldek/poldek/pkgdir/dir/dir.c
diff -u poldek/poldek/pkgdir/dir/dir.c:1.27 poldek/poldek/pkgdir/dir/dir.c:1.28
--- poldek/poldek/pkgdir/dir/dir.c:1.27	Fri Jun 22 00:26:56 2007
+++ poldek/poldek/pkgdir/dir/dir.c	Fri Jun 22 14:43:33 2007
@@ -268,20 +268,9 @@
             }
             pkg->groupid = pkgroup_idx_update_rpmhdr(pkgroups, h);
             
-            n_assert((ldflags & PKGDIR_LD_DESC) == 0);
-            
             if (ldflags & PKGDIR_LD_DESC) {
-                tn_array *langs;
-                
                 pkg->pkg_pkguinf = pkguinf_ldrpmhdr(na, h);
                 pkg_set_ldpkguinf(pkg);
-                if ((langs = pkguinf_langs(pkg->pkg_pkguinf))) {
-                    int i;
-                        
-                    for (i=0; i < n_array_size(langs); i++)
-                        pkgdir__update_avlangs(pkgdir,
-                                               n_array_nth(langs, i), 1);
-                }
             }
         }
 
@@ -329,6 +318,10 @@
     
     if (pkgdir->pkgroups == NULL)
         pkgdir->pkgroups = pkgroup_idx_new();
+
+    if (pkgdir->prev_pkgdir) /* make sense for mkidx only */
+        ldflags |= PKGDIR_LD_DESC; /* load descriptions now, it's faster
+                                      although consumes about 15% more memory */
     
     n = load_dir(pkgdir,
                  pkgdir->path, pkgdir->pkgs, pkgdir->pkgroups,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/poldek/poldek/pkgdir/dir/dir.c?r1=1.27&r2=1.28&f=u