#11080 sat doc OK

diff --git a/commands/doc.py b/commands/doc.py
index 4ffd3a0be9aef8090ba726a25cd8ea55fdec8f1d..6191e0a0e3be6f93a3eda9acd1c920b687a5fbe5 100644 (file)
--- 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 af890e99491f734f29362a65519ca557221a06c7..bbcf8936866588aa8290797ac2df6176f11546d5 100755 (executable)
--- 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):