]> SALOME platform Git repositories - tools/sat.git/commitdiff
Salome HOME
fix little bug about profile
authorSerge Rehbinder <serge.rehbinder@cea.fr>
Fri, 5 Aug 2016 08:40:45 +0000 (10:40 +0200)
committerSerge Rehbinder <serge.rehbinder@cea.fr>
Fri, 5 Aug 2016 08:40:45 +0000 (10:40 +0200)
commands/jobs.py
src/compilation.py
src/environment.py

index b6c4abe8bd499d075446f278142ab936e7e8e264..0999cf367f7298dbe36ac5d113912394d60702e0 100644 (file)
@@ -415,7 +415,8 @@ class Job(object):
                 self.remote_log_files.append(local_path)
             except Exception as e:
                 self.err += _("Unable to get %s log file from remote: %s" % 
-                                                    (job_path_remote, str(e)))
+                                                    (str(job_path_remote),
+                                                     str(e)))
 
     def has_failed(self):
         '''Returns True if the job has failed. 
@@ -1498,7 +1499,10 @@ def run(args, runner, logger):
                                                  " files :\n")), 4)
         logger.write("%s\n" % gui.xml_global_file.logFile, 4)
         for board in gui.d_xml_board_files.keys():
-            logger.write("%s\n" % gui.d_xml_board_files[board].logFile, 4)
+            file_path = gui.d_xml_board_files[board].logFile
+            file_name = os.path.basename(file_path)
+            logger.write("%s\n" % file_path, 4)
+            logger.add_link(file_name, "board", 0, board)
         
         logger.write("\n", 4)
     
index 9368db92e37bf44b53e26ee825b567b82c4f6984..842423d482d98db68d709c2096daabc9a7d7347b 100644 (file)
@@ -33,7 +33,13 @@ C_COMPILE_ENV_LIST = ["CC",
 class Builder:
     """Class to handle all construction steps, like cmake, configure, make, ...
     """
-    def __init__(self, config, logger, product_info, options = src.options.OptResult(), debug_mode=False, check_src=True):
+    def __init__(self,
+                 config,
+                 logger,
+                 product_info,
+                 options = src.options.OptResult(),
+                 debug_mode=False,
+                 check_src=True):
         self.config = config
         self.logger = logger
         self.options = options
index 668191a0fb2a7f4e4b5774f7083742df191279bb..a0cb5bbce93372b63776b4ab126c916031e9f728 100644 (file)
@@ -342,7 +342,8 @@ class SalomeEnviron:
                 self.add_line(1)
         
         # If there is profile (SALOME), then define additional variables
-        if 'profile' in self.cfg.APPLICATION:
+        if ('profile' in self.cfg.APPLICATION and 
+                                    "product" in self.cfg.APPLICATION.profile):
             profile_product = self.cfg.APPLICATION.profile.product
             product_info_profile = src.product.get_product_config(self.cfg,
                                                             profile_product)