From 199bd01c8a05d19a91c2fd7813cad7ff7304ba28 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 21 Jul 2011 14:21:42 -0700
Subject: [PATCH] make the man2html more general
Different versions of man2html generated slightly different output. This change
supports both known varieties of output.
---
doc/man/man2html.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/doc/man/man2html.py b/doc/man/man2html.py
index bfc20feff77..fe092c4d27f 100755
--- a/doc/man/man2html.py
+++ b/doc/man/man2html.py
@@ -88,8 +88,12 @@ def llnl_references(line):
return lineFix
return line
-def relative_reference(lineIn):
- fullRef = "http://localhost/cgi-bin/man/man2html"
+# NOTE: Different versions of man2html generated different paths
+def relative_reference(lineIn, mode):
+ if mode == 1:
+ fullRef = "http://localhost/cgi-bin/man/man2html"
+ else:
+ fullRef = "/cgi-bin/man/man2html"
lenRef = len(fullRef)
lineOt = ""
cursor = 0
@@ -185,7 +189,8 @@ for filename in files:
#insert tags for some options
insert_tag(html, line)
# Make man2html links relative ones
- line = relative_reference(line)
+ line = relative_reference(line, 1)
+ line = relative_reference(line, 2)
line = url_regex.sub(url_rewrite, line)
html.write(line)
--
GitLab