From 78cadadada66b6e6c2e5a5c2dc9f307fff33f2ab Mon Sep 17 00:00:00 2001 From: Serge Rehbinder Date: Fri, 5 Aug 2016 10:40:45 +0200 Subject: [PATCH] fix little bug about profile --- commands/jobs.py | 8 ++++++-- src/compilation.py | 8 +++++++- src/environment.py | 3 ++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/commands/jobs.py b/commands/jobs.py index b6c4abe..0999cf3 100644 --- a/commands/jobs.py +++ b/commands/jobs.py @@ -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) diff --git a/src/compilation.py b/src/compilation.py index 9368db9..842423d 100644 --- a/src/compilation.py +++ b/src/compilation.py @@ -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 diff --git a/src/environment.py b/src/environment.py index 668191a..a0cb5bb 100644 --- a/src/environment.py +++ b/src/environment.py @@ -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) -- 2.39.2