cb/b3b8e671f96a116cf1f950d41e11d6d37ea2b3

   1 Return-Path: <amthrax@drake.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 1D240429E32\r
   6         for <notmuch@notmuchmail.org>; Sat, 11 Jun 2011 13:05:31 -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 BklDiLdbokBO for <notmuch@notmuchmail.org>;\r
  16         Sat, 11 Jun 2011 13:05:30 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
  18         [18.9.25.14])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 9EF65429E2F\r
  20         for <notmuch@notmuchmail.org>; Sat, 11 Jun 2011 13:05:30 -0700 (PDT)\r
  21 X-AuditID: 1209190e-b7c39ae000000a8c-d9-4df3ca78ed55\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 3F.6A.02700.87AC3FD4; Sat, 11 Jun 2011 16:05:12 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id p5BK5TtP014967; \r
  27         Sat, 11 Jun 2011 16:05:29 -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 p5BK5Sun005840\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sat, 11 Jun 2011 16:05:29 -0400 (EDT)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.76)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1QVUQy-0000HZ-H1; Sat, 11 Jun 2011 16:05:28 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 03/17] lib: Add missing status check in\r
  41         _notmuch_message_remove_filename.\r
  42 Date: Sat, 11 Jun 2011 16:04:29 -0400\r
  43 Message-Id: <1307822683-848-4-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.5.1\r
  45 In-Reply-To: <1307822683-848-1-git-send-email-amdragon@mit.edu>\r
  46 References: <87ei34rnc5.fsf@yoom.home.cworth.org>\r
  47         <1307822683-848-1-git-send-email-amdragon@mit.edu>\r
  48 X-Brightmail-Tracker:\r
  49  H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixCmqrFtx6rOvwd6jlhbXb85kdmD0eLbq\r
  50         FnMAYxSXTUpqTmZZapG+XQJXxu3WaWwFC9gqrr6bzdrA+Ieli5GDQ0LAROLqKpUuRk4gU0zi\r
  51         wr31bF2MXBxCAvsYJToWbWKHcDYwSvy5cIQVwrnPJLFq8idmCGc+o8SJGQdYQfrZBDQktu1f\r
  52         zghiiwhIS+y8O5sVZAWzgJrEny6wFcICkRIXpm5nB7FZBFQlTpz8AXYFr4CdxIkXIRBXKEhc\r
  53         uTKPBcTmFLCXmHfwKpgtJJAmseTWbvYJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Rrr\r
  54         5WaW6KWmlG5iBIeMJN8Oxq8HlQ4xCnAwKvHw6q397CvEmlhWXJl7iFGSg0lJlFfnBFCILyk/\r
  55         pTIjsTgjvqg0J7X4EKMEB7OSCO/69k++QrwpiZVVqUX5MClpDhYlcd6Zkuq+QgLpiSWp2amp\r
  56         BalFMFkZDg4lCd7NJ4GGChalpqdWpGXmlCCkmTg4QYbzAA0/ClLDW1yQmFucmQ6RP8Woy/F4\r
  57         w6ZDjEIsefl5qVLivPdBigRAijJK8+DmwGL9FaM40FvCvD9AqniAaQJu0iugJUxASwRKwZaU\r
  58         JCKkpBoYhWdHbI9PW/3Q+ahSvbrjLCNFhcN9gYlLD/1cFzq98vRrs9D3B/eIr+QPUvv2t1sx\r
  59         rHj74kP7p21Zeu3ekSPvol7FF9enbdgn9Va6u03xU+amLn/D7X2FCzqubsm0vH6+bheTrcw/\r
  60         6X+bvS9L9E65eIJxyjGn5/6rp1w9rKO+9nNY5zrhr5PndSmxFGckGmoxFxUnAgBCLpum0AIA        AA==\r
  61 Cc: Austin Clements <amdragon@mit.edu>\r
  62 X-BeenThere: notmuch@notmuchmail.org\r
  63 X-Mailman-Version: 2.1.13\r
  64 Precedence: list\r
  65 List-Id: "Use and development of the notmuch mail system."\r
  66         <notmuch.notmuchmail.org>\r
  67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  70 List-Post: <mailto:notmuch@notmuchmail.org>\r
  71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  73         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  74 X-List-Received-Date: Sat, 11 Jun 2011 20:05:31 -0000\r
  75 \r
  76 Previously, this function would synchronize the folder list even if\r
  77 removing the file name failed.  Now it returns immediately if removing\r
  78 the file name fails.\r
  79 ---\r
  80  lib/message.cc |    2 ++\r
  81  1 files changed, 2 insertions(+), 0 deletions(-)\r
  82 \r
  83 diff --git a/lib/message.cc b/lib/message.cc\r
  84 index 4b59fa9..afb1d80 100644\r
  85 --- a/lib/message.cc\r
  86 +++ b/lib/message.cc\r
  87 @@ -529,6 +529,8 @@ _notmuch_message_remove_filename (notmuch_message_t *message,\r
  88                                                    "file-direntry", direntry);\r
  89      status = COERCE_STATUS (private_status,\r
  90                             "Unexpected error from _notmuch_message_remove_term");\r
  91 +    if (status)\r
  92 +       return status;\r
  93  \r
  94      /* Re-synchronize "folder:" terms for this message. This requires\r
  95       * first removing all "folder:" terms, then adding back terms for\r
  96 -- \r
  97 1.7.5.1\r
  98 \r