From: Fred Drake <fdrake@acm.org>
Date: Wed, 9 May 2001 04:04:11 +0000 (+0000)
Subject: Job.build_html():  Be more robust in ensuring about.html exists; copying
X-Git-Tag: v2.1.1c1~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecf6f592fdd7008a6d416ba952c0c496c8a3ccce;p=thirdparty%2FPython%2Fcpython.git

Job.build_html():  Be more robust in ensuring about.html exists; copying
    the right HTML file to the name about.html is needed even if the
    --numeric option was not given -- some other name may have been
    assigned due to some non-determinism in the algorithm use to perform
    name allocation.  ;-(

This closes the "About..." portion of SF bug #420216.
---

diff --git a/Doc/tools/mkhowto b/Doc/tools/mkhowto
index f11eec1dbda8..6481e93e2bb5 100755
--- a/Doc/tools/mkhowto
+++ b/Doc/tools/mkhowto
@@ -369,24 +369,23 @@ class Job:
         shutil.copyfile(os.path.join(builddir, self.doc + ".html"),
                         os.path.join(builddir, "index.html"))
         if max_split_depth != 1:
-            if self.options.numeric:
-                label_file = os.path.join(builddir, "labels.pl")
-                fp = open(label_file)
-                about_node = None
-                target = " = q/about/;\n"
-                x = len(target)
-                while 1:
+            label_file = os.path.join(builddir, "labels.pl")
+            fp = open(label_file)
+            about_node = None
+            target = " = q/about/;\n"
+            x = len(target)
+            while 1:
+                line = fp.readline()
+                if not line:
+                    break
+                if line[-x:] == target:
                     line = fp.readline()
-                    if not line:
-                        break
-                    if line[-x:] == target:
-                        line = fp.readline()
-                        m = re.search(r"\|(node\d+\.[a-z]+)\|", line)
-                        about_node = m.group(1)
-                        shutil.copyfile(os.path.join(builddir, about_node),
-                                        os.path.join(builddir, "about.html"))
-                        break
-            else:
+                    m = re.search(r"\|(node\d+\.[a-z]+)\|", line)
+                    about_node = m.group(1)
+                    shutil.copyfile(os.path.join(builddir, about_node),
+                                    os.path.join(builddir, "about.html"))
+                    break
+            if not self.options.numeric:
                 pwd = os.getcwd()
                 try:
                     os.chdir(builddir)