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

diff --git a/b6/d6163ecc37cb6a12fa005e80f05ce0aa300147 b/b6/d6163ecc37cb6a12fa005e80f05ce0aa300147
new file mode 100644 (file)
index 0000000..64d6914
--- /dev/null
+++ b/b6/d6163ecc37cb6a12fa005e80f05ce0aa300147
@@ -0,0 +1,88 @@
+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 4C91D431FBD\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 19:20:30 -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 breVqMOOa8qK for <notmuch@notmuchmail.org>;\r
+       Mon, 10 Mar 2014 19:20:25 -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 0156A431FC3\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 19:20:18 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WNCIh-0005QO-IJ; Mon, 10 Mar 2014 23:20:15 -0300\r
+Received: (nullmailer pid 7592 invoked by uid 1000); Tue, 11 Mar 2014\r
+       02:20:05 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] doc: have prerst2man.py generate roff files all in one\r
+       directory\r
+Date: Mon, 10 Mar 2014 23:18:29 -0300\r
+Message-Id: <1394504309-7433-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1394504309-7433-1-git-send-email-david@tethera.net>\r
+References: <m2y50hisnb.fsf@guru.guru-group.fi>\r
+       <1394504309-7433-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 02:20:30 -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 | 9 ++++-----\r
+ 1 file changed, 4 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/doc/prerst2man.py b/doc/prerst2man.py\r
+index 720deb6..adc0d3d 100644\r
+--- a/doc/prerst2man.py\r
++++ b/doc/prerst2man.py\r
+@@ -32,10 +32,8 @@ 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
++    print outdir\r
++    filename = outdir + '/' + page[1] + '.rst'\r
+     outfile = open(filename, 'w')\r
+     infile = open(sourcedir + '/' + page[0] + '.rst', 'r')\r
+ \r
+@@ -59,4 +57,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