From: Serge Rehbinder <serge.rehbinder@cea.fr>
Date: Thu, 15 Sep 2016 14:29:39 +0000 (+0200)
Subject: minor changes
X-Git-Tag: 5.0.0a1~124
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7f0af751196d77026de0edb185b284e79687dcf2;p=tools%2Fsat.git

minor changes
---

diff --git a/commands/compile.py b/commands/compile.py
index 6124d4e..46047de 100644
--- a/commands/compile.py
+++ b/commands/compile.py
@@ -503,6 +503,20 @@ def run(args, runner, logger):
     # check that the command has been called with an application
     src.check_config_has_application( runner.cfg )
 
+    # Print some informations
+    logger.write(_('Executing the compile commands in the build '
+                                'directories of the products of '
+                                'the application %s\n') % 
+                src.printcolors.printcLabel(runner.cfg.VARS.application), 1)
+    
+    info = [
+            (_("SOURCE directory"),
+             os.path.join(runner.cfg.APPLICATION.workdir, 'SOURCES')),
+            (_("BUILD directory"),
+             os.path.join(runner.cfg.APPLICATION.workdir, 'BUILD'))
+            ]
+    src.print_info(logger, info)
+
     # Get the list of products to treat
     products_infos = get_products_list(options, runner.cfg, logger)
 
@@ -517,19 +531,6 @@ def run(args, runner, logger):
     # Sort the list regarding the dependencies of the products
     products_infos = sort_products(runner.cfg, products_infos)
 
-    # Print some informations
-    logger.write(_('Executing the compile commands in the build '
-                                'directories of the products of '
-                                'the application %s\n') % 
-                src.printcolors.printcLabel(runner.cfg.VARS.application), 1)
-    
-    info = [
-            (_("SOURCE directory"),
-             os.path.join(runner.cfg.APPLICATION.workdir, 'SOURCES')),
-            (_("BUILD directory"),
-             os.path.join(runner.cfg.APPLICATION.workdir, 'BUILD'))
-            ]
-    src.print_info(logger, info)
     
     # Call the function that will loop over all the products and execute
     # the right command(s)
diff --git a/commands/log.py b/commands/log.py
index 28d5f35..504108d 100644
--- a/commands/log.py
+++ b/commands/log.py
@@ -160,7 +160,7 @@ def run(args, runner, logger):
             nbClean = nbLogFiles
         # Get the list to delete and do the removing
         lLogsToDelete = sorted(lLogs)[:nbClean]
-        for filePath, _, _, _, _, _ in lLogsToDelete:
+        for filePath, __, __, __, __, __ in lLogsToDelete:
             # remove the xml log file
             remove_log_file(filePath, logger)
             # remove also the corresponding txt file in OUT directory
@@ -218,7 +218,7 @@ def run(args, runner, logger):
         lLogs = src.logger.list_log_file(logDir, 
                                          src.logger.logCommandFileExpression)
         lLogsFiltered = []
-        for filePath, _, date, _, hour, cmd in lLogs:
+        for filePath, __, date, __, hour, cmd in lLogs:
             showLog, cmdAppli = src.logger.show_command_log(filePath, cmd, 
                                 runner.cfg.VARS.application, notShownCommands)
             if showLog:
@@ -228,7 +228,7 @@ def run(args, runner, logger):
         nb_logs = len(lLogsFiltered)
         index = 0
         # loop on all files and print it with date, time and command name 
-        for _, date, hour, cmd, cmdAppli in lLogsFiltered:          
+        for __, date, hour, cmd, cmdAppli in lLogsFiltered:          
             num = src.printcolors.printcLabel("%2d" % (nb_logs - index))
             logger.write("%s: %13s %s %s %s\n" % 
                          (num, cmd, date, hour, cmdAppli), 1, False)
@@ -247,11 +247,15 @@ def run(args, runner, logger):
         return 0
                     
     # 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, 
                               application = runner.cfg.VARS.application, 
                               notShownCommands = notShownCommands)
+    logger.write(src.printcolors.printc("OK"), 3)
+    logger.write("\n", 3)
     
     # open the hat xml in the user editor
+    logger.write(_("\nOpening the log file\n"), 3)
     src.system.show_in_editor(runner.cfg.USER.browser, xmlHatFilePath, logger)
     return 0
\ No newline at end of file
diff --git a/commands/prepare.py b/commands/prepare.py
index a09f4a4..eef6968 100644
--- a/commands/prepare.py
+++ b/commands/prepare.py
@@ -27,7 +27,7 @@ parser.add_option('p', 'products', 'list2', 'products',
     ' passed several time to prepare several products.'))
 parser.add_option('f', 'force', 'boolean', 'force', 
     _("force to prepare the products in development mode."))
-parser.add_option('f', 'force_patch', 'boolean', 'force_patch', 
+parser.add_option('', 'force_patch', 'boolean', 'force_patch', 
     _("force to apply patch to the products in development mode."))
 
 def get_products_list(options, cfg, logger):