2008-01-10 Marcus Brinkmann <marcus@g10code.de>

	* gpg/t-gpgconf.c (main): Allow for dirmngr not to be available.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index d63ca03884e8e0f258f9d672299bc4cfc26f885f..89b40b4ce32880190341fda29ca102213e51cebd 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,7 @@
 2008-01-10  Marcus Brinkmann  <marcus@g10code.de>
 
+       * gpg/t-gpgconf.c (main): Allow for dirmngr not to be available.
+
        * gpg/Makefile.am (./gpg-agent.conf): Correct pinentry path.
 
        * gpg/pinentry: New file.

diff --git a/tests/gpg/t-gpgconf.c b/tests/gpg/t-gpgconf.c
index a619a46593e7a1a961a7e3b1366460195564ee08..8d9fb200cb54f174ec7ed00d41abde9f08f5bf20 100644 (file)
--- a/tests/gpg/t-gpgconf.c
+++ b/tests/gpg/t-gpgconf.c
@@ -292,15 +292,23 @@ main (int argc, char **argv)
     comp = conf;
     while (comp && strcmp (comp->name, "dirmngr"))
       comp = comp->next;
-    opt = comp->options;
-    while (opt && strcmp (opt->name, "verbose"))
-      opt = opt->next;
-
-    err = gpgme_conf_opt_change (opt, 0, arg);
-    fail_if_err (err);
 
-    err = gpgme_op_conf_save (ctx, comp);
-    fail_if_err (err);
+    if (comp)
+      {
+       opt = comp->options;
+       while (opt && strcmp (opt->name, "verbose"))
+         opt = opt->next;
+       
+       /* Allow for the verbose option not to be there.  */
+       if (opt)
+         {
+           err = gpgme_conf_opt_change (opt, 0, arg);
+           fail_if_err (err);
+           
+           err = gpgme_op_conf_save (ctx, comp);
+           fail_if_err (err);
+         }
+      }
   }
 #endif