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