summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e075ee3)
Previously such errors were simply ignored. Now they cause an
immediate cleanup and abort.
add_files_state->renamed_messages++;
if (add_files_state->synchronize_flags == TRUE)
notmuch_message_maildir_flags_to_tags (message);
add_files_state->renamed_messages++;
if (add_files_state->synchronize_flags == TRUE)
notmuch_message_maildir_flags_to_tags (message);
+ status = NOTMUCH_STATUS_SUCCESS;
+ } else if (status == NOTMUCH_STATUS_SUCCESS) {
add_files_state->removed_messages++;
add_files_state->removed_messages++;
notmuch_message_destroy (message);
notmuch_database_end_atomic (notmuch);
return status;
notmuch_message_destroy (message);
notmuch_database_end_atomic (notmuch);
return status;
/* Recursively remove all filenames from the database referring to
* 'path' (or to any of its children). */
/* Recursively remove all filenames from the database referring to
* 'path' (or to any of its children). */
_remove_directory (void *ctx,
notmuch_database_t *notmuch,
const char *path,
add_files_state_t *add_files_state)
{
_remove_directory (void *ctx,
notmuch_database_t *notmuch,
const char *path,
add_files_state_t *add_files_state)
{
+ notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
notmuch_directory_t *directory;
notmuch_filenames_t *files, *subdirs;
char *absolute;
notmuch_directory_t *directory;
notmuch_filenames_t *files, *subdirs;
char *absolute;
{
absolute = talloc_asprintf (ctx, "%s/%s", path,
notmuch_filenames_get (files));
{
absolute = talloc_asprintf (ctx, "%s/%s", path,
notmuch_filenames_get (files));
- remove_filename (notmuch, absolute, add_files_state);
+ status = remove_filename (notmuch, absolute, add_files_state);
+ if (status)
+ goto DONE;
}
for (subdirs = notmuch_directory_get_child_directories (directory);
}
for (subdirs = notmuch_directory_get_child_directories (directory);
{
absolute = talloc_asprintf (ctx, "%s/%s", path,
notmuch_filenames_get (subdirs));
{
absolute = talloc_asprintf (ctx, "%s/%s", path,
notmuch_filenames_get (subdirs));
- _remove_directory (ctx, notmuch, absolute, add_files_state);
+ status = _remove_directory (ctx, notmuch, absolute, add_files_state);
+ if (status)
+ goto DONE;
notmuch_directory_destroy (directory);
notmuch_directory_destroy (directory);
gettimeofday (&tv_start, NULL);
for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) {
gettimeofday (&tv_start, NULL);
for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) {
- remove_filename (notmuch, f->filename, &add_files_state);
+ ret = remove_filename (notmuch, f->filename, &add_files_state);
+ if (ret)
+ goto DONE;
if (do_print_progress) {
do_print_progress = 0;
generic_print_progress ("Cleaned up", "messages",
if (do_print_progress) {
do_print_progress = 0;
generic_print_progress ("Cleaned up", "messages",
gettimeofday (&tv_start, NULL);
for (f = add_files_state.removed_directories->head, i = 0; f && !interrupted; f = f->next, i++) {
gettimeofday (&tv_start, NULL);
for (f = add_files_state.removed_directories->head, i = 0; f && !interrupted; f = f->next, i++) {
- _remove_directory (ctx, notmuch, f->filename, &add_files_state);
+ ret = _remove_directory (ctx, notmuch, f->filename, &add_files_state);
+ if (ret)
+ goto DONE;
if (do_print_progress) {
do_print_progress = 0;
generic_print_progress ("Cleaned up", "directories",
if (do_print_progress) {
do_print_progress = 0;
generic_print_progress ("Cleaned up", "directories",