77/c6153e51cc6f743854db7855835a95e43b2d1a

   1 Return-Path: <keevan@fastmail.fm>\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 5078E431FAF\r
   6         for <notmuch@notmuchmail.org>; Fri,  6 Sep 2013 15:15:34 -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 F7XwbwihtDpK for <notmuch@notmuchmail.org>;\r
  17         Fri,  6 Sep 2013 15:15:30 -0700 (PDT)\r
  18 Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com\r
  19         [66.111.4.27])\r
  20         (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
  21         (No client certificate requested)\r
  22         by olra.theworths.org (Postfix) with ESMTPS id 0C3B2431FAE\r
  23         for <notmuch@notmuchmail.org>; Fri,  6 Sep 2013 15:15:30 -0700 (PDT)\r
  24 Received: from compute1.internal (compute1.nyi.mail.srv.osa [10.202.2.41])\r
  25         by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 9F05A20B09;\r
  26         Fri,  6 Sep 2013 18:15:22 -0400 (EDT)\r
  27 Received: from frontend2 ([10.202.2.161])\r
  28         by compute1.internal (MEProxy); Fri, 06 Sep 2013 18:15:22 -0400\r
  29 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=8t8.us; h=date\r
  30         :from:to:cc:subject:message-id:mime-version:content-type; s=\r
  31         mesmtp; bh=N81VV1MMpBzvj+z/pvDFUWm4wKc=; b=svjk/y+RKcvthNN7M2sno\r
  32         E6lXbH4TqiLuinxhv20tlkaScKPfcJrUiU3+RX6nBXdRTrwa2usKKfwhQ2lm8Jyy\r
  33         Hkyprx9NpFl45onbnR3rEns0diB1LtD213JjtD902wbzZtVgWxK3PumOACoqa9Y+\r
  34         /RKvr0vaJMfk+ZJ7lILjQ8=\r
  35 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=\r
  36         messagingengine.com; h=date:from:to:cc:subject:message-id\r
  37         :mime-version:content-type; s=smtpout; bh=N81VV1MMpBzvj+z/pvDFUW\r
  38         m4wKc=; b=Db/qAamkPu7MEhBomGe9lffMD/WcqUEaPP1c8LzSlVocO4RgbcRcVV\r
  39         UBVXempYZ3kLpeaQLuNvatSTV4gDDsk0jA+180Z8HwqWuR0mMDcTXtgHCvVRmHHY\r
  40         YZhqVict6fXsiJyaK60LTFD6bo1E2glFqT6AOuI6do4w9E31LcjyI=\r
  41 X-Sasl-enc: Bm/byO7589pEX8oC3HYtFB+5RMCmibKjViypJs/cB6Sq 1378505721\r
  42 Received: from localhost (unknown [97.125.94.9])\r
  43         by mail.messagingengine.com (Postfix) with ESMTPA id F04C2680143;\r
  44         Fri,  6 Sep 2013 18:15:21 -0400 (EDT)\r
  45 Date: Fri, 6 Sep 2013 15:15:20 -0700\r
  46 From: "Kevin J. McCarthy" <kevin@8t8.us>\r
  47 To: notmuch@notmuchmail.org\r
  48 Subject: [PATCH 1/1] notmuch-mutt: Fix tagging issues\r
  49 Message-ID: <20130906221520.GC4226@zaogao.lan>\r
  50 Mail-Followup-To: notmuch@notmuchmail.org,\r
  51         Stefano Zacchiroli <zack@upsilon.cc>, Jason Miller <jason@milr.com>\r
  52 MIME-Version: 1.0\r
  53 Content-Type: multipart/signed; micalg=pgp-sha256;\r
  54         protocol="application/pgp-signature"; boundary="pQhZXvAqiZgbeUkD"\r
  55 Content-Disposition: inline\r
  56 OpenPGP: id=B6B1CD9613699FB8;\r
  57         url=http://www.8t8.us/configs/13699FB8.asc.pubkey; preference=sign\r
  58 User-Agent: Mutt/1.5.21 (2010-09-15)\r
  59 Cc: Stefano Zacchiroli <zack@upsilon.cc>\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, 06 Sep 2013 22:15:34 -0000\r
  73 \r
  74 \r
  75 --pQhZXvAqiZgbeUkD\r
  76 Content-Type: text/plain; charset=us-ascii\r
  77 Content-Disposition: inline\r
  78 Content-Transfer-Encoding: quoted-printable\r
  79 \r
  80 This patch fixes three issues with "notmuch-mutt tag":\r
  81 \r
  82 1. The message-id was not shell quoted.\r
  83    Thanks to Jason Miller for the bug report and patch.\r
  84 \r
  85 2. The tags passed into tag_action() were not being properly quoted.\r
  86    The "join before shell_quote" was combining multiple tags into a\r
  87    single argument to notmuch tag: '+one -two -three' instead of\r
  88    '+one' '-two' '-three'.  Note that shell_quote() will join array\r
  89    arguments with a space after quoting each, so a join afterwards was\r
  90    not needed.\r
  91 \r
  92 3. A "--" was added between the tags and search-term as shown in the\r
  93    current notmuch-tag man page.\r
  94 ---\r
  95  contrib/notmuch-mutt/notmuch-mutt | 5 +++--\r
  96  1 file changed, 3 insertions(+), 2 deletions(-)\r
  97 \r
  98 diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmu=\r
  99 ch-mutt\r
 100 index c69b35c..e5d6848 100755\r
 101 --- a/contrib/notmuch-mutt/notmuch-mutt\r
 102 +++ b/contrib/notmuch-mutt/notmuch-mutt\r
 103 @@ -114,8 +114,9 @@ sub tag_action(@) {\r
 104      defined $mid or die "notmuch-mutt: cannot find Message-Id, abort.\n";\r
 105 =20\r
 106      system("notmuch tag "\r
 107 -          . shell_quote(join(' ', @_))\r
 108 -          . " id:$mid");\r
 109 +          . shell_quote(@_)\r
 110 +          . " -- "\r
 111 +          . shell_quote("id:$mid"));\r
 112  }\r
 113 =20\r
 114  sub die_usage() {\r
 115 --=20\r
 116 1.8.4.rc3\r
 117 \r
 118 \r
 119 --pQhZXvAqiZgbeUkD\r
 120 Content-Type: application/pgp-signature; name="signature.asc"\r
 121 Content-Description: Digital signature\r
 122 \r
 123 -----BEGIN PGP SIGNATURE-----\r
 124 Version: GnuPG v1.4.14 (GNU/Linux)\r
 125 \r
 126 iQEcBAEBCAAGBQJSKlP4AAoJELaxzZYTaZ+4QJAIAK9yWz1lV31ctIbjKHfcSuob\r
 127 tD1lj7tBqjIzEbYKC5N9FmBQXUV7/z1JlIeMW2asLQ1SklZubZ8OJvGTh8FsDiUE\r
 128 HvFqnUbC+Za39DQnnk45slON2QmSBkfhEAwhxkWAqSMj6H58FWBDe0EWw6llLqjo\r
 129 KCHT/OdMsuFzUjDRLWiLr+fnZ+m9VcbNZHii8E14dxn1rm6J8KHbtuE+5qlOy1am\r
 130 cWBer8TjRN3mxDmKSx9vKMLyRxsuZJU6vttJ0oblZHfHTXeVsvpBSWThKnoqux+T\r
 131 t7hDLuumqrpVBnG0GsH4xasM5I9utJ8UQPN74YsyWl9tZE5mwNagKe2bjz65xMU=\r
 132 =ztJe\r
 133 -----END PGP SIGNATURE-----\r
 134 \r
 135 --pQhZXvAqiZgbeUkD--\r