poldek: poldek/lib_init.c, poldek/poldek_ts.c, poldek/poldek_inter...

mis mis at pld-linux.org
Sun Jan 27 17:02:00 CET 2008


Author: mis                          Date: Sun Jan 27 16:02:00 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- consistency: renamed depengine to depsolver

---- Files affected:
poldek/poldek:
   lib_init.c (1.91 -> 1.92) , poldek_ts.c (1.70 -> 1.71) , poldek_intern.h (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: poldek/poldek/lib_init.c
diff -u poldek/poldek/lib_init.c:1.91 poldek/poldek/lib_init.c:1.92
--- poldek/poldek/lib_init.c:1.91	Thu Jan 24 01:00:24 2008
+++ poldek/poldek/lib_init.c	Sun Jan 27 17:01:55 2008
@@ -1656,11 +1656,11 @@
 
     vfile_setup();
 
-    ctx->_depengine = 2; /* XXX: should be extracted from conf_sections.c */
+    ctx->_depsolver = 2; /* XXX: should be extracted from conf_sections.c */
     if (ctx->htconf) {
         tn_hash *htcnf = poldek_conf_get_section(ctx->htconf, "global");
-        ctx->_depengine = poldek_conf_get_int(htcnf, "dependency solver",
-                                              ctx->_depengine);
+        ctx->_depsolver = poldek_conf_get_int(htcnf, "dependency solver",
+                                              ctx->_depsolver);
     }
 
     ctx->_iflags |= SETUP_DONE;

================================================================
Index: poldek/poldek/poldek_ts.c
diff -u poldek/poldek/poldek_ts.c:1.70 poldek/poldek/poldek_ts.c:1.71
--- poldek/poldek/poldek_ts.c:1.70	Tue Jan 22 20:59:27 2008
+++ poldek/poldek/poldek_ts.c	Sun Jan 27 17:01:55 2008
@@ -967,7 +967,7 @@
     pkgdb_tx_begin(ts->db);
     DBGF("0 arg_packages_size=%d\n", arg_packages_size(ts->aps));
 
-    if (ts->ctx->_depengine == 3) { /* hope, soon */
+    if (ts->ctx->_depsolver == 3) { /* hope, soon */
         msgn(5, "Running #3 dependency engine...");
         rc = i3_do_poldek_ts_install(ts);
 

================================================================
Index: poldek/poldek/poldek_intern.h
diff -u poldek/poldek/poldek_intern.h:1.13 poldek/poldek/poldek_intern.h:1.14
--- poldek/poldek/poldek_intern.h:1.13	Tue Jan 22 13:40:09 2008
+++ poldek/poldek/poldek_intern.h	Sun Jan 27 17:01:55 2008
@@ -28,7 +28,7 @@
     struct pkgset    *ps;
     struct pm_ctx    *pmctx;       /* package manager context */
     int              _rpm_tscolor; /* rpm transaction color */
-    int              _depengine;
+    int              _depsolver;
 
     /* callbacks, don't call them directly */
     void *data_confirm_fn;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/lib_init.c?r1=1.91&r2=1.92&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/poldek_ts.c?r1=1.70&r2=1.71&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/poldek_intern.h?r1=1.13&r2=1.14&f=u



More information about the pld-cvs-commit mailing list