From: Christian Van Wambeke Date: Tue, 16 Oct 2018 08:34:13 +0000 (+0200) Subject: #11080 sat doc OK X-Git-Tag: 5.2.0~9^2~9 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=150c89b457290fcac6379c1a1337bcde30b78ba3;p=tools%2Fsat.git #11080 sat doc OK --- diff --git a/commands/doc.py b/commands/doc.py index 4ffd3a0..6191e0a 100644 --- a/commands/doc.py +++ b/commands/doc.py @@ -59,13 +59,22 @@ def run(args, runner, logger): logger.write("docdir %s\n" % docDir, 6) logger.write("options %s\n" % options, 6) + somethingDone = False if options.xml: src.system.show_in_editor(runner.cfg.USER.browser, htmlFile, logger) + somethingDone = True if options.pdf: src.system.show_in_editor(runner.cfg.USER.pdf_viewer, pdfFile, logger) + somethingDone = True if options.edit: src.system.show_in_editor(runner.cfg.USER.editor, rstFiles, logger) src.system.show_in_editor(runner.cfg.USER.editor, rstFilesCommands, logger) + somethingDone = True if options.compile: - logger.write("How to comile documentation:\n%s" % open(readmeFile,"r").read(), 3) + logger.write("How to compile documentation:\n%s" % open(readmeFile,"r").read(), 3) + somethingDone = True + + if not somethingDone: + src.system.show_in_editor(runner.cfg.USER.browser, htmlFile, logger) + return 0 diff --git a/src/options.py b/src/options.py index af890e9..bbcf893 100755 --- a/src/options.py +++ b/src/options.py @@ -260,7 +260,7 @@ class Options(object): option['result'] = None self.results = {"optlist": optlist, "optResult": optResult, "args": args, "argList": argList} - DBG.write("results", self.results, True) + DBG.write("results", self.results) return optResult, args def filterLevel(self, aLevel):