[Patch v2 1/3] doc: have prerst2man.py generate roff files all in one directory

diff --git a/0b/2d4ef7826606d3ba227b3ccb05ef5c413d6451 b/0b/2d4ef7826606d3ba227b3ccb05ef5c413d6451
new file mode 100644 (file)
index 0000000..1c71b22
--- /dev/null
+++ b/0b/2d4ef7826606d3ba227b3ccb05ef5c413d6451
@@ -0,0 +1,86 @@
+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 873DC431FD4\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 05:06:14 -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 0DUAPdTifT59 for <notmuch@notmuchmail.org>;\r
+       Tue, 11 Mar 2014 05:06:10 -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 30BDA431FC0\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 05:06:10 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WNLRh-0007Jj-Sc; Tue, 11 Mar 2014 09:06:09 -0300\r
+Received: (nullmailer pid 28621 invoked by uid 1000); Tue, 11 Mar 2014\r
+       12:05:59 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v2 1/3] doc: have prerst2man.py generate roff files all in\r
+       one directory\r
+Date: Tue, 11 Mar 2014 09:05:53 -0300\r
+Message-Id: <1394539555-28334-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1394539555-28334-1-git-send-email-david@tethera.net>\r
+References: <1394539555-28334-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: Tue, 11 Mar 2014 12:06:14 -0000\r
+\r
+Originally it seemed tidier to put them in subdirectories, but it\r
+turned out not to be obvious how to do that with sphinx. Bring the two\r
+methods back in sync again, and unbreak the generation of gzipped\r
+manpages.\r
+\r
+As a side-effect, fix a particular egregious combination of format and\r
+string concatenation.\r
+---\r
+ doc/prerst2man.py | 8 +++-----\r
+ 1 file changed, 3 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/doc/prerst2man.py b/doc/prerst2man.py\r
+index 720deb6..ec343e7 100644\r
+--- a/doc/prerst2man.py\r
++++ b/doc/prerst2man.py\r
+@@ -32,10 +32,7 @@ date.today().isoformat(), release, section, project))\r
+ \r
+ blankre = re.compile("^\s*$")\r
+ for page in man_pages:\r
+-    outdirname = outdir + '/' + dirname(page[0])\r
+-    if not isdir(outdirname):\r
+-        makedirs(outdirname, 0755)\r
+-    filename = outdir + '/' + page[0] + '.rst'\r
++    filename = outdir + '/' + page[1] + '.rst'\r
+     outfile = open(filename, 'w')\r
+     infile = open(sourcedir + '/' + page[0] + '.rst', 'r')\r
+ \r
+@@ -59,4 +56,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[1],page[4]))\r
+-- \r
+1.8.5.3\r
+\r