From 1ed5117200e49a1c9cfe49163d77090648c7cba9 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 21 Mar 2020 12:09:39 -0700 Subject: [PATCH] re-raise crtl+c, fixes #2292, thanks nursix --- gluon/shell.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gluon/shell.py b/gluon/shell.py index fe94692c..baecdb52 100644 --- a/gluon/shell.py +++ b/gluon/shell.py @@ -303,6 +303,11 @@ def run( if import_models: BaseAdapter.close_all_instances('commit') + except SystemExit: + print(traceback.format_exc()) + if import_models: + BaseAdapter.close_all_instances('rollback') + raise except: print(traceback.format_exc()) if import_models: @@ -312,6 +317,11 @@ def run( exec(python_code, _env) if import_models: BaseAdapter.close_all_instances('commit') + except SystemExit: + print(traceback.format_exc()) + if import_models: + BaseAdapter.close_all_instances('rollback') + raise except: print(traceback.format_exc()) if import_models: @@ -321,6 +331,11 @@ def run( execfile("scripts/migrator.py", _env) if import_models: BaseAdapter.close_all_instances('commit') + except SystemExit: + print(traceback.format_exc()) + if import_models: + BaseAdapter.close_all_instances('rollback') + raise except: print(traceback.format_exc()) if import_models: