From 9f6ec0cef971c785feeab0a446345027376f40a4 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Fri, 1 Mar 2002 00:57:40 +0000 Subject: merge help tag, architecture support from hampton branch --- gui.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'gui.py') diff --git a/gui.py b/gui.py index d03b64400..98b09f188 100755 --- a/gui.py +++ b/gui.py @@ -987,16 +987,28 @@ class InstallControlState: text = None if self.htmlFile: file = self.htmlFile + + if self.cw.configFileData.has_key("helptag"): + helpTag = "-%s" % (self.cw.configFileData["helptag"],) + else: + helpTag = "" + + arch = "-%s" % (iutil.getArch(),) + tags = [ "%s%s" % (helpTag, arch), "%s" % (helpTag,), + "%s" % (arch,), "" ] for path in self.searchPath: for lang in langPath + ['C']: - try: - text = open("%s/help/%s/s1-help-screens-%s.html" % - (path, lang, file)).read () - except IOError: - continue - else: - break + for tag in tags: + try: + text = open("%s/help/%s/s1-help-screens-%s%s.html" + % (path, lang, file, tag)).read () + except IOError: + continue + else: + break + if text: + break if text: return text -- cgit