Return-Path: <bgamari.foss@gmail.com>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 00B07431FDC
	for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 15:23:38 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: -0.799
X-Spam-Level: 
X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
	tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
	FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id G0D7cLuE60vJ for <notmuch@notmuchmail.org>;
	Mon, 28 Oct 2013 15:23:33 -0700 (PDT)
Received: from mail-qe0-f51.google.com (mail-qe0-f51.google.com
	[209.85.128.51]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id C6A4D431FDE
	for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 15:23:29 -0700 (PDT)
Received: by mail-qe0-f51.google.com with SMTP id q19so4463318qeb.38
	for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 15:23:28 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=from:to:cc:subject:date:message-id:in-reply-to:references;
	bh=7X+fb0nSeZE2BNT42DDJTouunzR/OzzOAC/Lbh58NS4=;
	b=gKmpDv5qXjupPa4m5890P/kznfmPeDM3EB64rB0zAg/yefMfO8WJDHtHx4ua+WjEFt
	Wa07cOkFrtznthcyBglci0NXn+axBDHd8TsgErnz1giBkBPQLyi6DPzBfy6QbNEmgcRh
	x2vpXgKo2PLbCAyxF5ZBSi9950Li9bkf1OfTQBgczJJjwYhOQ90Wj9jmJ30lLIi5MnKE
	KoLLRX4s7i3aLWnuK+B43bUbolCakoJENNqvRKE9E/6HWdwOAeUCG5z4vSOKAboxFThT
	N8tlT3lHQsAJFguVW2s8rwTLB8yzp09W1+Y3h5fFE7pRAlPdTGbLS5MTEszGFWFiVq7r
	DEnw==
X-Received: by 10.224.73.200 with SMTP id r8mr32972060qaj.72.1382999008229;
	Mon, 28 Oct 2013 15:23:28 -0700 (PDT)
Received: from ben-laptop.hasb.physics.cns (physicsnat56.physics.umass.edu.
	[128.119.50.38])
	by mx.google.com with ESMTPSA id x1sm57796293qai.6.2013.10.28.15.23.27
	for <multiple recipients>
	(version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
	Mon, 28 Oct 2013 15:23:27 -0700 (PDT)
From: Ben Gamari <bgamari.foss@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/4] compact: Give user more feedback on failure renaming
Date: Mon, 28 Oct 2013 18:23:15 -0400
Message-Id: <1382998997-9938-2-git-send-email-bgamari.foss@gmail.com>
X-Mailer: git-send-email 1.8.3.2
In-Reply-To: <1382998997-9938-1-git-send-email-bgamari.foss@gmail.com>
References: <1382998997-9938-1-git-send-email-bgamari.foss@gmail.com>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Oct 2013 22:23:38 -0000

Provide the user with instructions after we fail to move the old
un-compacted database out of the way.

Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
---
 lib/database.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/database.cc b/lib/database.cc
index 06f1c0a..57c2292 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -922,7 +922,14 @@ notmuch_database_compact (const char* path,
 
     if (old_xapian_path != NULL) {
 	if (rename(xapian_path, old_xapian_path)) {
-	    fprintf (stderr, "Error moving old database out of the way\n");
+	    fprintf (stderr, "Error moving old database out of the way: %s\n",
+		     strerror(errno));
+	    fprintf (stderr, "\n");
+	    fprintf (stderr, "Old database: %s\n", xapian_path);
+	    fprintf (stderr, "Compacted database: %s\n", compact_xapian_path);
+	    fprintf (stderr, "\n");
+	    fprintf (stderr, "At this point it's probably best to remove the compacted database,\n");
+	    fprintf (stderr, "find the cause of this error, and try compacting again.\n");
 	    ret = NOTMUCH_STATUS_FILE_ERROR;
 	    goto DONE;
 	}
-- 
1.8.3.2