diff options
| author | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
| commit | c5959fd09de61604bedd75354401df6a57395d65 (patch) | |
| tree | 3b0227f631c8b20fb1a1a274b92f63f52f34af2c /scripts/LocalDriver.py | |
| parent | Small fix (diff) | |
| parent | Enable -Wconversion with clang - Close #363 (diff) | |
| download | ice-c5959fd09de61604bedd75354401df6a57395d65.tar.bz2 ice-c5959fd09de61604bedd75354401df6a57395d65.tar.xz ice-c5959fd09de61604bedd75354401df6a57395d65.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'scripts/LocalDriver.py')
| -rw-r--r-- | scripts/LocalDriver.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/LocalDriver.py b/scripts/LocalDriver.py index a04c03157a0..1dd6f858e34 100644 --- a/scripts/LocalDriver.py +++ b/scripts/LocalDriver.py @@ -577,6 +577,8 @@ class LocalDriver(Driver): self.runner.stopServerSide(server, current, success) except Exception as ex: failure.append(ex) + except KeyboardInterrupt: # Potentially raised by Except.py if Ctrl-C + pass sem.release() t=threading.Thread(target = stopServerSide) |