git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add exception for KeyboardInterrupt to allow for manual stop without
[monitor.git]
/
pcucontrol
/
util
/
command.py
diff --git
a/pcucontrol/util/command.py
b/pcucontrol/util/command.py
index
e5663c3
..
899d667
100644
(file)
--- a/
pcucontrol/util/command.py
+++ b/
pcucontrol/util/command.py
@@
-73,6
+73,9
@@
class CMD:
except ExceptionReadTimeout:
print traceback.print_exc()
return ("", "RunningScriptTimeout")
except ExceptionReadTimeout:
print traceback.print_exc()
return ("", "RunningScriptTimeout")
+ except KeyboardInterrupt:
+ print "Interrupted, exiting..."
+ sys.exit(1)
except Exception, err:
from monitor.common import email_exception
email_exception()
except Exception, err:
from monitor.common import email_exception
email_exception()