zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Propagate exceptions from Spack python console (#34547)

Browse Source 
fixes #34489

Customize sys.excepthook to raise SystemExit when
any unhandled exception reaches the hook.
This commit is contained in:
Massimiliano Culpo 2022-12-15 18:08:53 +01:00 committed by GitHub
parent 8a02463d7d
commit 22922bf74c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/spack/spack/cmd/python.py
View File

@ -127,8 +127,10 @@ def python_interpreter(args):
console.runsource(startup.read(), startup_file, "exec") console.runsource(startup.read(), startup_file, "exec")
if args.python_command: if args.python_command:
propagate_exceptions_from(console)
console.runsource(args.python_command) console.runsource(args.python_command)
elif args.python_args: elif args.python_args:
propagate_exceptions_from(console)
sys.argv = args.python_args sys.argv = args.python_args
with open(args.python_args[0]) as file: with open(args.python_args[0]) as file:
console.runsource(file.read(), args.python_args[0], "exec") console.runsource(file.read(), args.python_args[0], "exec")
@ -149,3 +151,18 @@ def python_interpreter(args):
platform.machine(), platform.machine(),
) )
) )
def propagate_exceptions_from(console):
"""Set sys.excepthook to let uncaught exceptions return 1 to the shell.
Args:
console (code.InteractiveConsole): the console that needs a change in sys.excepthook
"""
console.push("import sys")
console.push("_wrapped_hook = sys.excepthook")
console.push("def _hook(exc_type, exc_value, exc_tb):")
console.push(" _wrapped_hook(exc_type, exc_value, exc_tb)")
console.push(" sys.exit(1)")
console.push("")
console.push("sys.excepthook = _hook")