|
50 | 50 |
|
51 | 51 | import easybuild.tools.asyncprocess as asyncprocess |
52 | 52 | from easybuild.base import fancylogger |
53 | | -from easybuild.base.exceptions import LoggedException |
54 | | -from easybuild.tools.build_log import EasyBuildError, dry_run_msg, print_error, print_msg, time_str_since |
| 53 | +from easybuild.tools.build_log import EasyBuildError, dry_run_msg, print_msg, time_str_since |
55 | 54 | from easybuild.tools.config import ERROR, IGNORE, WARN, build_option |
56 | 55 | from easybuild.tools.hooks import RUN_SHELL_CMD, load_hooks, run_hook |
57 | 56 | from easybuild.tools.utilities import trace_msg |
@@ -151,9 +150,6 @@ def raise_run_shell_cmd_error(cmd, exit_code, work_dir, output, stderr): |
151 | 150 | # 3) run_cmd_cache decorator |
152 | 151 | # 4) actual caller site |
153 | 152 | frameinfo = inspect.getouterframes(inspect.currentframe())[3] |
154 | | - caller_file_name = frameinfo.filename |
155 | | - caller_line_nr = frameinfo.lineno |
156 | | - caller_function_name = frameinfo.function |
157 | 153 | caller_info = (frameinfo.filename, frameinfo.lineno, frameinfo.function) |
158 | 154 |
|
159 | 155 | raise RunShellCmdError(cmd, exit_code, work_dir, output, stderr, caller_info) |
@@ -290,7 +286,7 @@ def to_cmd_str(cmd): |
290 | 286 |
|
291 | 287 | # return output as a regular string rather than a byte sequence (and non-UTF-8 characters get stripped out) |
292 | 288 | output = proc.stdout.decode('utf-8', 'ignore') |
293 | | - stderr= proc.stderr.decode('utf-8', 'ignore') if split_stderr else None |
| 289 | + stderr = proc.stderr.decode('utf-8', 'ignore') if split_stderr else None |
294 | 290 |
|
295 | 291 | res = RunShellCmdResult(cmd=cmd_str, exit_code=proc.returncode, output=output, stderr=stderr, work_dir=work_dir) |
296 | 292 |
|
|
0 commit comments