re-raise crtl+c, fixes #2292, thanks nursix

2020-03-21 12:09:39 -07:00
parent 97a0eac8ce
commit 1ed5117200
1 changed files with 15 additions and 0 deletions
@@ -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: