From: David Bremner Date: Mon, 10 Oct 2011 13:44:07 +0000 (-0300) Subject: notmuch-dump: deprecate use of output file argument. X-Git-Tag: 0.10_rc1~77 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=53b397acfcd6b6372372593cc9047ee1a9599afd notmuch-dump: deprecate use of output file argument. We print an intentionally non-specific message on stderr, since it isn't clear if there will be some global output file argument to replace. We update the test suite atomically, since it relies on having the same text in two files. --- diff --git a/notmuch-dump.c b/notmuch-dump.c index ac5d0742..409c86ad 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -42,6 +42,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) return 1; if (argc && strcmp (argv[0], "--") != 0) { + fprintf (stderr, "Warning: the output file argument of dump is deprecated.\n"); output = fopen (argv[0], "w"); if (output == NULL) { fprintf (stderr, "Error opening %s for writing: %s\n", diff --git a/test/dump-restore b/test/dump-restore index e7edd9b2..de856938 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -12,6 +12,10 @@ test_begin_subtest "dump outfile" notmuch dump dump-outfile.actual test_expect_equal_file dump.expected dump-outfile.actual +test_begin_subtest "dump outfile # deprecated" +test_expect_equal "Warning: the output file argument of dump is deprecated."\ + "$(notmuch dump /dev/null 2>&1)" + test_begin_subtest "dump outfile --" notmuch dump dump-1-arg-dash.actual -- test_expect_equal_file dump.expected dump-1-arg-dash.actual