Get an absolute path for env files in packages.

[tools/sat.git] / commands / log.py

diff --git a/commands/log.py b/commands/log.py
index 20f975bd561926ffb404569b071e5bf1a036e1f2..08e5f23915a38908f8edde5a9f32aa72881dbb35 100644 (file)
--- a/commands/log.py
+++ b/commands/log.py
@@ -138,14 +138,14 @@ def show_last_logs(logger, config, log_dirs):
 
 def show_product_last_logs(logger, config, product_log_dir):
     """Show last compilation logs of a product"""
-    files = os.listdir(product_log_dir)
     # sort the files chronologically
     l_time_file = []
     for file_n in os.listdir(product_log_dir):
         my_stat = os.stat(os.path.join(product_log_dir, file_n))
         l_time_file.append(
               (datetime.datetime.fromtimestamp(my_stat[stat.ST_MTIME]), file_n))
-        
+    
+    # display the available logs
     for i, (__, file_name) in enumerate(sorted(l_time_file)):
         str_indice = src.printcolors.printcLabel("%2d" % (i+1))
         opt = []
@@ -159,9 +159,10 @@ def show_product_last_logs(logger, config, product_log_dir):
     # loop till exit
     x = -1
     while (x < 0):
-        x = ask_value(len(files))
+        x = ask_value(len(l_time_file))
         if x > 0:
-            log_file_path = os.path.join(product_log_dir, files[x-1])
+            (__, file_name) =  sorted(l_time_file)[x-1]
+            log_file_path = os.path.join(product_log_dir, file_name)
             src.system.show_in_editor(config.USER.editor, log_file_path, logger)
         
 def ask_value(nb):
@@ -202,7 +203,7 @@ def run(args, runner, logger):
     (options, args) = parser.parse_args(args)
 
     # get the log directory. 
-    logDir = runner.cfg.USER.log_dir
+    logDir = src.get_log_path(runner.cfg)
     
     # Print a header
     nb_files_log_dir = len(glob.glob(os.path.join(logDir, "*")))
@@ -264,6 +265,7 @@ def run(args, runner, logger):
 
     # If the last option is invoked, just, show the last log file
     if options.last_terminal:
+        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)
@@ -320,7 +322,7 @@ def run(args, runner, logger):
     # Create or update the hat xml that gives access to all the commands log files
     logger.write(_("Generating the hat log file (can be long) ... "), 3)
     xmlHatFilePath = os.path.join(logDir, 'hat.xml')
-    src.logger.update_hat_xml(runner.cfg.USER.log_dir, 
+    src.logger.update_hat_xml(logDir, 
                               application = runner.cfg.VARS.application, 
                               notShownCommands = notShownCommands)
     logger.write(src.printcolors.printc("OK"), 3)