X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=commands%2Flog.py;h=22a788570fc8fa85895c4ea82891a55e1b865ba6;hb=00a94c7b2e189587897f2fed3d7ee94a1f642800;hp=8d2aa1c73224df9634af6b3a1233be3386308b42;hpb=e1f36d3ebfb86f289ea0f44542c43db1b752f883;p=tools%2Fsat.git

diff --git a/commands/log.py b/commands/log.py
index 8d2aa1c..22a7885 100644
--- a/commands/log.py
+++ b/commands/log.py
@@ -34,20 +34,18 @@ import src
 
 # Define all possible option for log command :  sat log <options>
 parser = src.options.Options()
-parser.add_option('t', 'terminal', 'boolean', 'terminal', "Optional: "
-                  "Terminal log.")
-parser.add_option('l', 'last', 'boolean', 'last', "Show the log of the last "
-                  "Optional: launched command.")
-parser.add_option('', 'last_terminal', 'boolean', 'last_terminal', "Show the "
-                  "log of the last compilations"
-                  "Optional: launched command.")
-parser.add_option('f', 'full', 'boolean', 'full', "Optional: Show the logs of "
-                  "ALL the launched commands.")
-parser.add_option('c', 'clean', 'int', 'clean', "Optional: Erase the n most "
-                  "ancient log files.")
-parser.add_option('n', 'no_browser', 'boolean', 'no_browser', "Optional: Do not"
-                  " launch the browser at the end of the command. Only update "
-                  "the hat file.")
+parser.add_option('t', 'terminal', 'boolean', 'terminal',
+                  "Optional: Show the log (in terminal) of a command, with user choice.")
+parser.add_option('l', 'last', 'boolean', 'last',
+                  "Optional: Show the log (in browser) of the last launched command.")
+parser.add_option('', 'last_compile', 'boolean', 'last_compile',
+                  "Optional: Show the log (in terminal) of the last compilation for all products.")
+parser.add_option('f', 'full', 'boolean', 'full',
+                  "Optional: Show the logs of ALL the launched commands.")
+parser.add_option('c', 'clean', 'int', 'clean',
+                  "Erase the n most ancient log files.")
+parser.add_option('n', 'no_browser', 'boolean', 'no_browser',
+                  "Optional: Do not launch the browser at the end of the command. Only update the hat file.")
 
 def get_last_log_file(logDir, notShownCommands):
     '''Used in case of last option. Get the last log command file path.
@@ -114,6 +112,7 @@ def print_log_command_in_terminal(filePath, logger):
 def show_last_logs(logger, config, log_dirs):
     """Show last compilation logs"""
     log_dir = os.path.join(config.APPLICATION.workdir, 'LOGS')
+    sorted_log_dirs = sorted(log_dirs)
     # list the logs
     nb = len(log_dirs)
     nb_cols = 4
@@ -122,7 +121,7 @@ def show_last_logs(logger, config, log_dirs):
         for i in range(0, nb_cols):
             k = index + i * col_size
             if k < nb:
-                l = log_dirs[k]
+                l = sorted_log_dirs[k]
                 str_indice = src.printcolors.printcLabel("%2d" % (k+1))
                 log_name = l
                 logger.write("%s: %-30s" % (str_indice, log_name), 1, False)
@@ -133,7 +132,7 @@ def show_last_logs(logger, config, log_dirs):
     while (x < 0):
         x = ask_value(nb)
         if x > 0:
-            product_log_dir = os.path.join(log_dir, log_dirs[x-1])
+            product_log_dir = os.path.join(log_dir, sorted_log_dirs[x-1])
             show_product_last_logs(logger, config, product_log_dir)
 
 def show_product_last_logs(logger, config, product_log_dir):
@@ -276,7 +275,7 @@ def run(args, runner, logger):
       logger.warning("problem for writing in directory '%s', may be not owner." % logDir)
 
     # If the last option is invoked, just, show the last log file
-    if options.last_terminal:
+    if options.last_compile:
         src.check_config_has_application(runner.cfg)
         log_dirs = os.listdir(os.path.join(runner.cfg.APPLICATION.workdir, 'LOGS'))
         show_last_logs(logger, runner.cfg, log_dirs)
@@ -348,7 +347,7 @@ def run(args, runner, logger):
     # open the hat xml in the user editor
     if not options.no_browser:
         logger.write(_("\nOpening the hat log file %s\n" % xmlHatFilePath), 3)
-        src.system.show_in_editor(runner.cfg.USER.browser, xmlHatFilePath, logger)
+        src.system.show_in_webbrowser(runner.cfg.USER.browser, xmlHatFilePath, logger)
     else:
         logger.write("\nHat log File is %s\n" % xmlHatFilePath, 3)
     return 0