summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-12-06 16:29:08 (GMT)
committerRichard Purdie <richard@openedhand.com>2006-12-06 16:29:08 (GMT)
commitaac2b8d7471c74d8e5d559c17df2140b110fa170 (patch)
tree9ef7c89c53b91906fdf0e1043f6e05cd5081b1a3 /bitbake
parentc690f8956385b2f2c62ea280d37b370742302d4e (diff)
downloadpoky-aac2b8d7471c74d8e5d559c17df2140b110fa170.tar.gz
runqueue.py: Send SIGINT upon Ctrl+C, not SIGNTERM
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1014 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/runqueue.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 5768e3c..4da543f 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -422,7 +422,7 @@ class RunQueue:
422 # Bypass finally below 422 # Bypass finally below
423 active_builds = 0 423 active_builds = 0
424 # Stop Ctrl+C being sent to children 424 # Stop Ctrl+C being sent to children
425 signal.signal(signal.SIGINT, signal.SIG_IGN) 425 # signal.signal(signal.SIGINT, signal.SIG_IGN)
426 # Make the child the process group leader 426 # Make the child the process group leader
427 os.setpgid(0, 0) 427 os.setpgid(0, 0)
428 sys.stdin = open('/dev/null', 'r') 428 sys.stdin = open('/dev/null', 'r')
@@ -472,9 +472,9 @@ class RunQueue:
472 if len(failed_fnids) > 0: 472 if len(failed_fnids) > 0:
473 return failed_fnids 473 return failed_fnids
474 except: 474 except:
475 bb.msg.note(1, bb.msg.domain.RunQueue, "Sending SIGTERM to remaining %s tasks" % active_builds) 475 bb.msg.note(1, bb.msg.domain.RunQueue, "Sending SIGINT to remaining %s tasks" % active_builds)
476 for k, v in build_pids.iteritems(): 476 for k, v in build_pids.iteritems():
477 os.kill(-k, signal.SIGTERM) 477 os.kill(-k, signal.SIGINT)
478 raise 478 raise
479 479
480 # Sanity Checks 480 # Sanity Checks