2d/2de01c6dbb4c0ed472a44fa40c42887b7f5ce7

   1 Return-Path: <bgamari.foss@gmail.com>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 5D486429E5D\r
   6         for <notmuch@notmuchmail.org>; Sun, 27 Oct 2013 13:30:28 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.799\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id Q0jGhxSfi6xb for <notmuch@notmuchmail.org>;\r
  17         Sun, 27 Oct 2013 13:30:23 -0700 (PDT)\r
  18 Received: from mail-qc0-f182.google.com (mail-qc0-f182.google.com\r
  19         [209.85.216.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 260BD429E3A\r
  22         for <notmuch@notmuchmail.org>; Sun, 27 Oct 2013 13:30:20 -0700 (PDT)\r
  23 Received: by mail-qc0-f182.google.com with SMTP id n7so3328618qcx.41\r
  24         for <notmuch@notmuchmail.org>; Sun, 27 Oct 2013 13:30:18 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  26         h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
  27         bh=7X+fb0nSeZE2BNT42DDJTouunzR/OzzOAC/Lbh58NS4=;\r
  28         b=1HUUJdUzdkbg+V2GElO5lcvHGmNqZ2wk6NusjFi2wZC43NsNKvbAJat1C06s4Kz0MA\r
  29         lBtb3GvnWf+aYuBaAJXVgq/tY8fm8K74mxESfZ1tTOXl4qshvUQQfLZW5aPE29zi7yhX\r
  30         KLHsf7SEEltaFAAWe9168SxJNFTQA5+3qsoLgsJv/xjRxMDQif7ZxqKPTqqKBmEJ1pjB\r
  31         jqQKBuOhAYjHxWh0J6HEprHklz5BGiLiDGm5fVIbGQVuHCCcSX4JuGL4RHsRZ72Vw7r4\r
  32         auQHV2tDTrsu1Ie1ILo2QQBxh3MlyT3kKpwOlOuUJD4QpsP6WLgbnetsODdd+mmfCjxs\r
  33         piDg==\r
  34 X-Received: by 10.224.54.209 with SMTP id r17mr25780250qag.16.1382905818494;\r
  35         Sun, 27 Oct 2013 13:30:18 -0700 (PDT)\r
  36 Received: from localhost.localdomain\r
  37         (pool-96-240-254-51.spfdma.east.verizon.net. [96.240.254.51])\r
  38         by mx.google.com with ESMTPSA id x1sm45270525qai.6.2013.10.27.13.30.17\r
  39         for <multiple recipients>\r
  40         (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);\r
  41         Sun, 27 Oct 2013 13:30:18 -0700 (PDT)\r
  42 From: Ben Gamari <bgamari.foss@gmail.com>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 2/3] compact: Give user more feedback on failure renaming\r
  45 Date: Sun, 27 Oct 2013 16:30:06 -0400\r
  46 Message-Id: <1382905807-22220-2-git-send-email-bgamari.foss@gmail.com>\r
  47 X-Mailer: git-send-email 1.8.3.2\r
  48 In-Reply-To: <1382905807-22220-1-git-send-email-bgamari.foss@gmail.com>\r
  49 References: <1382905807-22220-1-git-send-email-bgamari.foss@gmail.com>\r
  50 X-BeenThere: notmuch@notmuchmail.org\r
  51 X-Mailman-Version: 2.1.13\r
  52 Precedence: list\r
  53 List-Id: "Use and development of the notmuch mail system."\r
  54         <notmuch.notmuchmail.org>\r
  55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  56         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  58 List-Post: <mailto:notmuch@notmuchmail.org>\r
  59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  61         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  62 X-List-Received-Date: Sun, 27 Oct 2013 20:30:28 -0000\r
  63 \r
  64 Provide the user with instructions after we fail to move the old\r
  65 un-compacted database out of the way.\r
  66 \r
  67 Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>\r
  68 ---\r
  69  lib/database.cc | 9 ++++++++-\r
  70  1 file changed, 8 insertions(+), 1 deletion(-)\r
  71 \r
  72 diff --git a/lib/database.cc b/lib/database.cc\r
  73 index 06f1c0a..57c2292 100644\r
  74 --- a/lib/database.cc\r
  75 +++ b/lib/database.cc\r
  76 @@ -922,7 +922,14 @@ notmuch_database_compact (const char* path,\r
  77  \r
  78      if (old_xapian_path != NULL) {\r
  79         if (rename(xapian_path, old_xapian_path)) {\r
  80 -           fprintf (stderr, "Error moving old database out of the way\n");\r
  81 +           fprintf (stderr, "Error moving old database out of the way: %s\n",\r
  82 +                    strerror(errno));\r
  83 +           fprintf (stderr, "\n");\r
  84 +           fprintf (stderr, "Old database: %s\n", xapian_path);\r
  85 +           fprintf (stderr, "Compacted database: %s\n", compact_xapian_path);\r
  86 +           fprintf (stderr, "\n");\r
  87 +           fprintf (stderr, "At this point it's probably best to remove the compacted database,\n");\r
  88 +           fprintf (stderr, "find the cause of this error, and try compacting again.\n");\r
  89             ret = NOTMUCH_STATUS_FILE_ERROR;\r
  90             goto DONE;\r
  91         }\r
  92 -- \r
  93 1.8.3.2\r
  94 \r