diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2018-02-01 12:13:48 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2018-02-01 12:18:47 -0500 |
| commit | 3ddbd34a7c4b9cbe1676625162d4638cfad0b408 (patch) | |
| tree | 7f7551c0d269a45a68920add7c12caedd101f878 | |
| parent | 67f9c4948d2384a21c2cf64a1bfae0719e28ea2e (diff) | |
| download | kutter-3ddbd34a7c4b9cbe1676625162d4638cfad0b408.tar.gz kutter-3ddbd34a7c4b9cbe1676625162d4638cfad0b408.tar.xz kutter-3ddbd34a7c4b9cbe1676625162d4638cfad0b408.zip | |
gcode: Propagate errors from run_script()
If the script being run raises an error, then stop running that script
and return the error to the caller.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | klippy/gcode.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/klippy/gcode.py b/klippy/gcode.py index 8895764f..5a7c50f2 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -161,11 +161,15 @@ class GCodeParser: except error as e: self.respond_error(str(e)) self.reset_last_position() + if not need_ack: + raise except: msg = 'Internal error on command:"%s"' % (cmd,) logging.exception(msg) self.printer.invoke_shutdown(msg) self.respond_error(msg) + if not need_ack: + raise self.ack() self.need_ack = prev_need_ack def process_data(self, eventtime): |