From 3a4543f68cd8bb380b6a4f75e6885e6bc40c3c38 Mon Sep 17 00:00:00 2001 From: crouzet Date: Fri, 11 Jan 2019 15:24:16 +0100 Subject: [PATCH] sat #8532 : renommage option last_terminal en last_compile --- commands/log.py | 6 +++--- complete_sat.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/commands/log.py b/commands/log.py index 5ecf702..d42fda0 100644 --- a/commands/log.py +++ b/commands/log.py @@ -38,8 +38,8 @@ parser.add_option('t', 'terminal', 'boolean', 'terminal', "Optional: Show the log (in terminal) of a command, with user choice.") parser.add_option('l', 'last', 'boolean', 'last', "Optional: Show the log (in browser) of the last launched command.") -parser.add_option('', 'last_terminal', 'boolean', 'last_terminal', - "Optional: Show the log (in terminal) of the last launched command.") +parser.add_option('', 'last_compile', 'boolean', 'last_compile', + "Optional: Show the log (in terminal) of the last compilation for all products.") parser.add_option('f', 'full', 'boolean', 'full', "Optional: Show the logs of ALL the launched commands.") parser.add_option('c', 'clean', 'int', 'clean', @@ -274,7 +274,7 @@ def run(args, runner, logger): logger.warning("problem for writing in directory '%s', may be not owner." % logDir) # If the last option is invoked, just, show the last log file - if options.last_terminal: + if options.last_compile: 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) diff --git a/complete_sat.sh b/complete_sat.sh index 5b87bf7..db6b7cd 100755 --- a/complete_sat.sh +++ b/complete_sat.sh @@ -32,7 +32,7 @@ _show_applications() opts2=$(echo --list --value --edit --info $opts2) ;; log) - opts2=$(echo --clean --full --last --terminal --no_browser $opts2) + opts2=$(echo --clean --full --last --terminal --last_compile --no_browser $opts2) ;; jobs) opts2=$(echo --name --only_jobs --list --completion --test_connection --input_boards --publish $opts2) @@ -162,7 +162,7 @@ _salomeTools_complete() return 0 ;; log) - opts="--clean --last --terminal --last --last_terminal --no_browser" + opts="--clean --last --terminal --last --last_compile --no_browser" COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; -- 2.39.2