poldek: poldek/doc/poldek.conf.xml, poldek/lib_init.c - renamed de...

[mis]

Author: mis                          Date: Sun Jul  8 15:27:16 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- renamed depengine option; supported pm_command with options

---- Files affected:
poldek/poldek/doc:
   poldek.conf.xml (1.11 -> 1.12) 
poldek/poldek:
   lib_init.c (1.85 -> 1.86) 

---- Diffs:

================================================================
Index: poldek/poldek/doc/poldek.conf.xml
diff -u poldek/poldek/doc/poldek.conf.xml:1.11 poldek/poldek/doc/poldek.conf.xml:1.12
--- poldek/poldek/doc/poldek.conf.xml:1.11	Thu Jun 28 02:06:51 2007
+++ poldek/poldek/doc/poldek.conf.xml	Sun Jul  8 17:27:11 2007
@@ -411,7 +411,7 @@
  Subtle dependency processing options, they should not be changed 
  unless you know what you are doing
 </description>
-  <option name="dependency engine version" type="integer" default="2" hidden="yes">
+  <option name="dependency solver" type="integer" default="2" hidden="yes">
   </option>
  
   <option name="auto directory dependencies" type="boolean3" default="auto" op="AUTODIRDEP">

================================================================
Index: poldek/poldek/lib_init.c
diff -u poldek/poldek/lib_init.c:1.85 poldek/poldek/lib_init.c:1.86
--- poldek/poldek/lib_init.c:1.85	Fri Jul  6 00:59:20 2007
+++ poldek/poldek/lib_init.c	Sun Jul  8 17:27:11 2007
@@ -1609,9 +1609,24 @@
         tn_hash *htcnf;
 
         htcnf = poldek_conf_get_section(ctx->htconf, "global");
-        if ((op = poldek_conf_get(htcnf, "pm command", NULL)))
-            pm_configure(ctx->pmctx, "pmcmd", (void*)op);
-
+        if ((op = poldek_conf_get(htcnf, "pm command", NULL))) {
+            if (strchr(op, ' ') == NULL) { /* with options? */
+                pm_configure(ctx->pmctx, "pmcmd", (void*)op);
+                
+            } else {
+                const char **tl, **tl_save;
+                tl = tl_save = n_str_tokl(op, " \t");
+                pm_configure(ctx->pmctx, "pmcmd", (void*)*tl);
+                tl++;
+                while (*tl) {
+                    poldek_ts_configure(ctx->ts, POLDEK_CONF_RPMOPTS, *tl);
+                    DBGF("%d (%s) -> (%s)\n", tag, *tl, name);
+                    tl++;
+                }
+                n_str_tokl_free(tl_save);
+            }
+        }
+        
         if ((op = poldek_conf_get(htcnf, "sudo command", NULL)))
             pm_configure(ctx->pmctx, "sudocmd", (void*)op);
     }
@@ -1640,7 +1655,7 @@
     ctx->_depengine = 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 engine version",
+        ctx->_depengine = poldek_conf_get_int(htcnf, "dependency solver",
                                               ctx->_depengine);
     }
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/poldek/poldek/doc/poldek.conf.xml?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/poldek/poldek/lib_init.c?r1=1.85&r2=1.86&f=u