notmuch_message_tags_to_maildir_flags: Don't exit on failure to rename.
authorCarl Worth <cworth@cworth.org>
Thu, 11 Nov 2010 11:50:42 +0000 (03:50 -0800)
committerCarl Worth <cworth@cworth.org>
Thu, 11 Nov 2010 11:50:42 +0000 (03:50 -0800)
It is totally legitimate for a non-maildir directory to be named "new"
(and not have a directory next to it named "cur"). To support this
case at least, be silent about any rename failure.

lib/message.cc

index 8ae929012d5a4f8d3c6761b356d47d19731aa685..b4bf0ce03463c0245a8d729ee33dbc4fde7af99e 100644 (file)
@@ -1009,15 +1009,11 @@ notmuch_message_tags_to_maildir_flags (notmuch_message_t *message)
        strcpy (filename_new+(p-filename)+3, flags);
 
        if (strcmp (filename, filename_new) != 0) {
-           notmuch_status_t status;
+           notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
 
            ret = rename (filename, filename_new);
-           if (ret == -1) {
-               perror (talloc_asprintf (message, "rename of %s to %s failed",
-                                    filename, filename_new));
-               exit (1);
-           }
-           status = _notmuch_message_rename (message, filename_new);
+           if (ret == 0)
+               status = _notmuch_message_rename (message, filename_new);
 
            _notmuch_message_sync (message);