From 8d21480727e319d01d6aef3b495d8df1d6c4d7fa Mon Sep 17 00:00:00 2001 From: Serge Rehbinder Date: Wed, 10 Feb 2016 11:38:23 +0100 Subject: [PATCH] Write log even if command fails (bug in code). Right print of command to launch to get the log --- salomeTools.py | 11 ++++++----- src/logger.py | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/salomeTools.py b/salomeTools.py index 30a3697..3225920 100755 --- a/salomeTools.py +++ b/salomeTools.py @@ -152,11 +152,12 @@ class Sat(object): if logger: logger_command = logger - # Execute the run method of the command - res = __module__.run(argv, self, logger_command) - - # put final attributes in xml log file (end time, total time, ...) and write it - logger_command.endWrite() + try: + # Execute the run method of the command + res = __module__.run(argv, self, logger_command) + finally: + # put final attributes in xml log file (end time, total time, ...) and write it + logger_command.endWrite() return res diff --git a/src/logger.py b/src/logger.py index 50c349e..5705013 100644 --- a/src/logger.py +++ b/src/logger.py @@ -107,7 +107,10 @@ class Logger(object): def endWrite(self): self.write(_('\nTap the following command to get the log :\n'), screenOnly=True) - self.write('%s/sat log\n' % self.config.VARS.salometoolsway, screenOnly=True) + if 'APPLICATION' in self.config: + self.write('%s/sat log %s\n' % (self.config.VARS.salometoolsway, self.config.VARS.application), screenOnly=True) + else: + self.write('%s/sat log\n' % self.config.VARS.salometoolsway, screenOnly=True) dt = datetime.datetime.now() endtime = dt.strftime('%Y%m%d_%H%M%S') -- 2.39.2