debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-02-17 23:53:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch restore was skipping entries with no new tags

Browse source 
notmuch restore used to only add tags; now that it clears existing
tags, it needs to operate on messages even if the new tag list is empty.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Carl Worth <cworth@cworth.org>:

I fixed up the indentation here, (someday we might switch to 8-space
indents, but we haven't yet).
This commit is contained in:
Keith Packard 2009-11-16 11:53:35 -08:00 • committed by Carl Worth
parent d5068983b8
commit c004e1e04b
1 changed files with 27 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
notmuch-restore.c
View file

@ -81,37 +81,34 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
tags = xstrndup (line + match[2].rm_so, tags = xstrndup (line + match[2].rm_so,
match[2].rm_eo - match[2].rm_so); match[2].rm_eo - match[2].rm_so);
if (strlen (tags)) { message = notmuch_database_find_message (notmuch, message_id);
if (message == NULL) {
message = notmuch_database_find_message (notmuch, message_id); fprintf (stderr, "Warning: Cannot apply tags to missing message: %s\n",
if (message == NULL) { message_id);
fprintf (stderr, "Warning: Cannot apply tags to missing message: %s\n", goto NEXT_LINE;
message_id);
goto NEXT_LINE;
}
notmuch_message_freeze (message);
notmuch_message_remove_all_tags (message);
next = tags;
while (next) {
tag = strsep (&next, " ");
if (*tag == '\0')
continue;
status = notmuch_message_add_tag (message, tag);
if (status) {
fprintf (stderr,
"Error applying tag %s to message %s:\n",
tag, message_id);
fprintf (stderr, "%s\n",
notmuch_status_to_string (status));
}
}
notmuch_message_thaw (message);
notmuch_message_destroy (message);
} }
notmuch_message_freeze (message);
notmuch_message_remove_all_tags (message);
next = tags;
while (next) {
tag = strsep (&next, " ");
if (*tag == '\0')
continue;
status = notmuch_message_add_tag (message, tag);
if (status) {
fprintf (stderr,
"Error applying tag %s to message %s:\n",
tag, message_id);
fprintf (stderr, "%s\n",
notmuch_status_to_string (status));
}
}
notmuch_message_thaw (message);
notmuch_message_destroy (message);
NEXT_LINE: NEXT_LINE:
free (message_id); free (message_id);
free (tags); free (tags);