re-raise crtl+c, fixes #2292, thanks nursix
This commit is contained in:
1 parent
97a0eac8ce
commit
1ed5117200
1 file changed
+15
@@ -303,6 +303,11 @@ def run(
|
|||||||
|
|
||||||
if import_models:
|
if import_models:
|
||||||
BaseAdapter.close_all_instances('commit')
|
BaseAdapter.close_all_instances('commit')
|
||||||
|
except SystemExit:
|
||||||
|
print(traceback.format_exc())
|
||||||
|
if import_models:
|
||||||
|
BaseAdapter.close_all_instances('rollback')
|
||||||
|
raise
|
||||||
except:
|
except:
|
||||||
print(traceback.format_exc())
|
print(traceback.format_exc())
|
||||||
if import_models:
|
if import_models:
|
||||||
@@ -312,6 +317,11 @@ def run(
|
|||||||
exec(python_code, _env)
|
exec(python_code, _env)
|
||||||
if import_models:
|
if import_models:
|
||||||
BaseAdapter.close_all_instances('commit')
|
BaseAdapter.close_all_instances('commit')
|
||||||
|
except SystemExit:
|
||||||
|
print(traceback.format_exc())
|
||||||
|
if import_models:
|
||||||
|
BaseAdapter.close_all_instances('rollback')
|
||||||
|
raise
|
||||||
except:
|
except:
|
||||||
print(traceback.format_exc())
|
print(traceback.format_exc())
|
||||||
if import_models:
|
if import_models:
|
||||||
@@ -321,6 +331,11 @@ def run(
|
|||||||
execfile("scripts/migrator.py", _env)
|
execfile("scripts/migrator.py", _env)
|
||||||
if import_models:
|
if import_models:
|
||||||
BaseAdapter.close_all_instances('commit')
|
BaseAdapter.close_all_instances('commit')
|
||||||
|
except SystemExit:
|
||||||
|
print(traceback.format_exc())
|
||||||
|
if import_models:
|
||||||
|
BaseAdapter.close_all_instances('rollback')
|
||||||
|
raise
|
||||||
except:
|
except:
|
||||||
print(traceback.format_exc())
|
print(traceback.format_exc())
|
||||||
if import_models:
|
if import_models:
|
||||||
|
|||||||
Reference in new issue
Block a user