[Patch v3 4/4] doc: cosmetic fix for prerst2man.py

diff --git a/bc/0546538cce444760152832d23e7185ae7a8e2e b/bc/0546538cce444760152832d23e7185ae7a8e2e
new file mode 100644 (file)
index 0000000..9b301be
--- /dev/null
+++ b/bc/0546538cce444760152832d23e7185ae7a8e2e
@@ -0,0 +1,69 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 2CA82431FD8\r
+       for <notmuch@notmuchmail.org>; Wed, 12 Mar 2014 20:21:41 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id fhtUSo4SuvaV for <notmuch@notmuchmail.org>;\r
+       Wed, 12 Mar 2014 20:21:37 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 2A564431FC0\r
+       for <notmuch@notmuchmail.org>; Wed, 12 Mar 2014 20:21:37 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WNwDA-0000Cg-75; Thu, 13 Mar 2014 00:21:36 -0300\r
+Received: (nullmailer pid 25683 invoked by uid 1000); Thu, 13 Mar 2014\r
+       03:21:29 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v3 4/4] doc: cosmetic fix for prerst2man.py\r
+Date: Thu, 13 Mar 2014 00:21:17 -0300\r
+Message-Id: <1394680877-25572-5-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1394680877-25572-1-git-send-email-david@tethera.net>\r
+References: <m238iozjmc.fsf@guru.guru-group.fi>\r
+       <1394680877-25572-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 13 Mar 2014 03:21:41 -0000\r
+\r
+Fix a particular egregious combination of format and string\r
+concatenation.\r
+---\r
+ doc/prerst2man.py | 3 ++-\r
+ 1 file changed, 2 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/doc/prerst2man.py b/doc/prerst2man.py\r
+index 720deb6..4591264 100644\r
+--- a/doc/prerst2man.py\r
++++ b/doc/prerst2man.py\r
+@@ -59,4 +59,5 @@ for page in man_pages:\r
+     outfile.write("".join(lines))\r
+     outfile.close()\r
+ \r
+-    os.system('set -x; rst2man {0} {1}'.format(filename, outdir + '/' + page[0] + '.' + str(page[4])))\r
++    os.system('set -x; rst2man {0} {1}/{2}.{3}'\r
++              .format(filename, outdir, page[0],page[4]))\r
+-- \r
+1.8.5.3\r
+\r