[PATCH 3/3] compact: Provide user with more error feedback

[Tomi Ollila]

On Sun, Oct 27 2013, Ben Gamari <bgamari.foss at gmail.com> wrote:

> Provide instructions on what to do when we couldn't move the compacted
> database into place.
>
> Signed-off-by: Ben Gamari <bgamari.foss at gmail.com>
> ---
>  lib/database.cc | 18 +++++++++++++++++-
>  1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/lib/database.cc b/lib/database.cc
> index 57c2292..6f9fed1 100644
> --- a/lib/database.cc
> +++ b/lib/database.cc
> @@ -938,7 +938,23 @@ notmuch_database_compact (const char* path,
>      }
>  
>      if (rename(compact_xapian_path, xapian_path)) {
> -	fprintf (stderr, "Error moving compacted database\n");
> +	fprintf (stderr, "Error moving compacted database into place: %s\n", strerror(errno));
> +	fprintf (stderr, "\n");
> +	fprintf (stderr, "Encountered error %s while moving the compacted database,\n",
> +		 strerror(errno));

You probably missed my comments in id:m2d2mz7qv7.fsf at guru.guru-group.fi ?

Tomi

> +	fprintf (stderr, "\n");
> +	fprintf (stderr, "    %s\n", compact_xapian_path);
> +	fprintf (stderr, "\n");
> +	fprintf (stderr, "to\n");
> +	fprintf (stderr, "\n");
> +	fprintf (stderr, "    %s\n", xapian_path);
> +	fprintf (stderr, "\n");
> +	fprintf (stderr, "Please identify the reason for this and move the compacted database into place manually.\n");
> +	if (backup_path != NULL) {
> +	    fprintf (stderr, "Otherwise, you can revert to the backup database located at,\n");
> +	    fprintf (stderr, "\n");
> +	    fprintf (stderr, "    %s\n", backup_path);
> +	}
>  	ret = NOTMUCH_STATUS_FILE_ERROR;
>  	goto DONE;
>      }
> -- 
> 1.8.3.2
>
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch