poldek: poldek/poldek_intern.h, poldek/lib_pkgset.c, poldek/lib_in...

[mis]

Author: mis                          Date: Tue Jan 22 12:40:15 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- cleanup: poldek__load_sources_internal()

---- Files affected:
poldek/poldek:
   poldek_intern.h (1.12 -> 1.13) , lib_pkgset.c (1.22 -> 1.23) , lib_init.c (1.88 -> 1.89) 

---- Diffs:

================================================================
Index: poldek/poldek/poldek_intern.h
diff -u poldek/poldek/poldek_intern.h:1.12 poldek/poldek/poldek_intern.h:1.13
--- poldek/poldek/poldek_intern.h:1.12	Sun Jul  8 18:59:15 2007
+++ poldek/poldek/poldek_intern.h	Tue Jan 22 13:40:09 2008
@@ -78,5 +78,6 @@
                          const char *capname, tn_array *pkgs, struct pkg *hint);
 
 void poldek__setup_default_ask_callbacks(struct poldek_ctx *ctx);
+int poldek__load_sources_internal(struct poldek_ctx *ctx);
 
 #endif

================================================================
Index: poldek/poldek/lib_pkgset.c
diff -u poldek/poldek/lib_pkgset.c:1.22 poldek/poldek/lib_pkgset.c:1.23
--- poldek/poldek/lib_pkgset.c:1.22	Thu Jul 12 23:29:26 2007
+++ poldek/poldek/lib_pkgset.c	Tue Jan 22 13:40:09 2008
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2000 - 2002 Pawel A. Gajda <mis at pld.org.pl>
+  Copyright (C) 2000 - 2008 Pawel A. Gajda <mis at pld-linux.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License, version 2 as
@@ -41,7 +41,7 @@
 #include "pm/pm.h"
 #include "split.h"
 
-int poldek_load_sources__internal(struct poldek_ctx *ctx)
+int poldek__load_sources_internal(struct poldek_ctx *ctx)
 {
     struct pkgset *ps;
     struct poldek_ts *ts;
@@ -54,7 +54,7 @@
     
     if ((ps = pkgset_new(ctx->pmctx)) == NULL)
         return 0;
-        
+    
     if (pm_get_dbdepdirs(ctx->pmctx, ctx->ts->rootdir, NULL, ps->depdirs) >= 0)
         ps->flags |= PSET_DBDIRS_LOADED;
     
@@ -64,8 +64,10 @@
     if (ctx->ts->getop(ctx->ts, POLDEK_OP_LDFULLFILELIST))
         ldflags |= PKGDIR_LD_FULLFLIST;
 
+#if 0 /* XXX now files are loaded on demand */
     if (strcmp(pm_get_name(ctx->pmctx), "pset") == 0)
         ldflags |= PKGDIR_LD_FULLFLIST;
+#endif    
 
     if (ctx->ts->getop(ctx->ts, POLDEK_OP_AUTODIRDEP))
         ldflags |= PKGDIR_LD_DIRINDEX;

================================================================
Index: poldek/poldek/lib_init.c
diff -u poldek/poldek/lib_init.c:1.88 poldek/poldek/lib_init.c:1.89
--- poldek/poldek/lib_init.c:1.88	Mon Jul  9 20:31:14 2007
+++ poldek/poldek/lib_init.c	Tue Jan 22 13:40:09 2008
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2000 - 2007 Pawel A. Gajda <mis at pld-linux.org>
+  Copyright (C) 2000 - 2008 Pawel A. Gajda <mis at pld-linux.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License, version 2 as
@@ -87,8 +87,6 @@
 static
 int do_poldek_setup_cachedir(struct poldek_ctx *ctx);
 
-extern
-int poldek_load_sources__internal(struct poldek_ctx *ctx, int load_dbdepdirs);
 
 struct default_op_map_ent {
     int config;                 /* configuration var? */
@@ -1587,6 +1585,10 @@
                 }
                 pm_configure(ctx->pmctx, "source", dest);
             }
+
+            if (ctx->ts->getop(ctx->ts, POLDEK_OP_AUTODIRDEP))
+                pm_configure(ctx->pmctx, "autodirdep", NULL);
+            
         }
 
         if (ctx->pmctx) {
@@ -1679,7 +1681,7 @@
     if (ctx->_iflags & SOURCES_LOADED)
         return 1;
     
-    rc = poldek_load_sources__internal(ctx, 1);
+    rc = poldek__load_sources_internal(ctx);
     ctx->_iflags |= SOURCES_LOADED;
     return rc;
 }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/poldek_intern.h?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/lib_pkgset.c?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/lib_init.c?r1=1.88&r2=1.89&f=u