f9/7efadd6b4d46f8464d70147fed7158ca80c33b

   1 Return-Path: <amdragon@mit.edu>\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 2416D429E27\r
   6         for <notmuch@notmuchmail.org>; Thu, 17 May 2012 21:13:56 -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.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id 8XNm-XhW3OFt for <notmuch@notmuchmail.org>;\r
  16         Thu, 17 May 2012 21:13:55 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
  18         [18.9.25.12])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 3634B431FD7\r
  20         for <notmuch@notmuchmail.org>; Thu, 17 May 2012 21:13:53 -0700 (PDT)\r
  21 X-AuditID: 1209190c-b7fad6d000000920-fd-4fb5cc8004a3\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id E7.1D.02336.08CC5BF4; Fri, 18 May 2012 00:13:52 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q4I4DqOM009483; \r
  27         Fri, 18 May 2012 00:13:52 -0400\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4I4Dp4c026797\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Fri, 18 May 2012 00:13:52 -0400 (EDT)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1SVEZb-0000zL-6K; Fri, 18 May 2012 00:13:51 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 9/9] lib: Don't needlessly create directory docs in\r
  41         _notmuch_message_remove_filename\r
  42 Date: Fri, 18 May 2012 00:13:42 -0400\r
  43 Message-Id: <1337314423-3702-10-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.10\r
  45 In-Reply-To: <1337314423-3702-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1337314423-3702-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixG6nrttwZqu/wavzOhbXb85kdmD0eLbq\r
  49         FnMAYxSXTUpqTmZZapG+XQJXxqTWeewFz9kq+q52MTUwnmDtYuTkkBAwkZgwdRUjhC0mceHe\r
  50         erYuRi4OIYF9jBKfbzWCFQkJbGCU2HVbFiJxn0li1f23TBDOLEaJZxuPsYBUsQloSGzbvxxs\r
  51         lIiAtMTOu7OBujk4mAXUJP50qYCEhQVSJI40nwMrYRFQlZh9fj6YzSvgIHH23BOoi+Qlnt7v\r
  52         YwNp5QSKTzseDXGDvcS/C80sExj5FzAyrGKUTcmt0s1NzMwpTk3WLU5OzMtLLdI11MvNLNFL\r
  53         TSndxAgKGU5Jnh2Mbw4qHWIU4GBU4uHdMWervxBrYllxZe4hRkkOJiVR3u8ngUJ8SfkplRmJ\r
  54         xRnxRaU5qcWHGCU4mJVEeGW7gXK8KYmVValF+TApaQ4WJXFeFa13fkIC6YklqdmpqQWpRTBZ\r
  55         GQ4OJQnet6eBGgWLUtNTK9Iyc0oQ0kwcnCDDeUCGnwEZXlyQmFucmQ6RP8WoKCXO+wOkWQAk\r
  56         kVGaB9cLi+lXjOJArwjzcoC08wDTAVz3K6DBTECDy3I3gQwuSURISTUwbl/Rfsxk5v+WrlCJ\r
  57         slMVCYLTzgj5pZ3M7HDwTfUW3bsi3Ldm4rT593KDVVJz/v1bPbWtqlhec/76PvEbChLZQUEM\r
  58         f2f3XJNyS/1q/4vl1xK1KiljuZcXvql196k3Lj2c5XPedX2std/sxIo8SZFnbyOYL/qsO2sk\r
  59         8en0aqYrp2RWNf+UMZdWYinOSDTUYi4qTgQATePa2cQCAAA=\r
  60 X-BeenThere: notmuch@notmuchmail.org\r
  61 X-Mailman-Version: 2.1.13\r
  62 Precedence: list\r
  63 List-Id: "Use and development of the notmuch mail system."\r
  64         <notmuch.notmuchmail.org>\r
  65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  66         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  68 List-Post: <mailto:notmuch@notmuchmail.org>\r
  69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  71         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  72 X-List-Received-Date: Fri, 18 May 2012 04:13:56 -0000\r
  73 \r
  74 Previously, if passed a filename with a directory that did not exist\r
  75 in the database, _notmuch_message_remove_filename would needlessly\r
  76 create that directory document.  Fix it so that doesn't happen.\r
  77 ---\r
  78  lib/message.cc |    4 ++--\r
  79  1 file changed, 2 insertions(+), 2 deletions(-)\r
  80 \r
  81 diff --git a/lib/message.cc b/lib/message.cc\r
  82 index 8d552f1..6787506 100644\r
  83 --- a/lib/message.cc\r
  84 +++ b/lib/message.cc\r
  85 @@ -541,8 +541,8 @@ _notmuch_message_remove_filename (notmuch_message_t *message,\r
  86      Xapian::TermIterator i, last;\r
  87  \r
  88      status = _notmuch_database_filename_to_direntry (\r
  89 -       local, message->notmuch, filename, NOTMUCH_FIND_CREATE, &direntry);\r
  90 -    if (status)\r
  91 +       local, message->notmuch, filename, NOTMUCH_FIND_LOOKUP, &direntry);\r
  92 +    if (status || !direntry)\r
  93         return status;\r
  94  \r
  95      /* Unlink this file from its parent directory. */\r
  96 -- \r
  97 1.7.10\r
  98 \r