aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bremner <bremner@debian.org>2011-10-10 10:44:07 -0300
committerDavid Bremner <bremner@debian.org>2011-10-16 19:59:53 -0300
commit53b397acfcd6b6372372593cc9047ee1a9599afd (patch)
tree9b21752fbb517d64413e27ba3457472f592174ae
parent09beff1def1daa9887679723205855ff7da8a297 (diff)
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.
-rw-r--r--notmuch-dump.c1
-rwxr-xr-xtest/dump-restore4
2 files changed, 5 insertions, 0 deletions
diff --git a/notmuch-dump.c b/notmuch-dump.c
index ac5d074..409c86a 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 e7edd9b..de85693 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