debian: update changelogs for pre-release

[notmuch] / notmuch-config.c

diff --git a/notmuch-config.c b/notmuch-config.c
index 2d5c297b7f5f2996b89c6e7c9502df90a06c93d6..d252bb25d4bb565d78c88a14e5719949259a076d 100644 (file)
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -872,8 +872,19 @@ int
 notmuch_config_command (notmuch_config_t *config, int argc, char *argv[])
 {
     int ret;
+    int opt_index;
 
-    argc--; argv++; /* skip subcommand argument */
+    opt_index = notmuch_minimal_options ("config", argc, argv);
+    if (opt_index < 0)
+       return EXIT_FAILURE;
+
+    if (notmuch_requested_db_uuid)
+       fprintf (stderr, "Warning: ignoring --uuid=%s\n",
+                notmuch_requested_db_uuid);
+
+    /* skip at least subcommand argument */
+    argc-= opt_index;
+    argv+= opt_index;
 
     if (argc < 1) {
        fprintf (stderr, "Error: notmuch config requires at least one argument.\n");