##// END OF EJS Templates
move SignalInterrupt class into util module.
Vadim Gelfer -
r2153:635653cd default
parent child Browse files
Show More
@@ -3260,11 +3260,8 b' def find(cmd):'
3260
3260
3261 raise UnknownCommand(cmd)
3261 raise UnknownCommand(cmd)
3262
3262
3263 class SignalInterrupt(Exception):
3264 """Exception raised on SIGTERM and SIGHUP."""
3265
3266 def catchterm(*args):
3263 def catchterm(*args):
3267 raise SignalInterrupt
3264 raise util.SignalInterrupt
3268
3265
3269 def run():
3266 def run():
3270 sys.exit(dispatch(sys.argv[1:]))
3267 sys.exit(dispatch(sys.argv[1:]))
@@ -3464,7 +3461,7 b' def dispatch(args):'
3464 (inst.desc or inst.filename, inst.strerror))
3461 (inst.desc or inst.filename, inst.strerror))
3465 except revlog.RevlogError, inst:
3462 except revlog.RevlogError, inst:
3466 u.warn(_("abort: "), inst, "!\n")
3463 u.warn(_("abort: "), inst, "!\n")
3467 except SignalInterrupt:
3464 except util.SignalInterrupt:
3468 u.warn(_("killed!\n"))
3465 u.warn(_("killed!\n"))
3469 except KeyboardInterrupt:
3466 except KeyboardInterrupt:
3470 try:
3467 try:
@@ -16,6 +16,9 b' from demandload import *'
16 demandload(globals(), "cStringIO errno popen2 re shutil sys tempfile")
16 demandload(globals(), "cStringIO errno popen2 re shutil sys tempfile")
17 demandload(globals(), "threading time")
17 demandload(globals(), "threading time")
18
18
19 class SignalInterrupt(Exception):
20 """Exception raised on SIGTERM and SIGHUP."""
21
19 def pipefilter(s, cmd):
22 def pipefilter(s, cmd):
20 '''filter string S through command CMD, returning its output'''
23 '''filter string S through command CMD, returning its output'''
21 (pout, pin) = popen2.popen2(cmd, -1, 'b')
24 (pout, pin) = popen2.popen2(cmd, -1, 'b')
General Comments 0
You need to be logged in to leave comments. Login now