summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2010-08-04 21:58:51 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-31 10:34:08 +0000
commit96e7518472996b443083b73ec31dfb24afa2f268 (patch)
treed4baa28460c12b67acd86c4ea3fe598b8b9f4d7a
parent58507838bbd1b83aff380c5cc5de1df9d532bf2e (diff)
downloadpoky-96e7518472996b443083b73ec31dfb24afa2f268.tar.gz
When shutting down, send SIGTERM, not SIGINT
SIGINT should be from the user, not a script. It also doesn't work as reliably to shut down processes, as it's not always interpreted as a termination request. In addition, it causes KeyboardInterrupt exceptions in the worker processes, which can interfere with our exception handling. (Bitbake rev: e5f6e0e9de4c6d1dfdd269d2bf7f83c00c415a27) Signed-off-by: Chris Larson <clarson@kergoth.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--bitbake/lib/bb/runqueue.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 4f988dfdc9..d1e8cd11ee 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1028,10 +1028,10 @@ class RunQueueExecute:
1028 1028
1029 def finish_now(self): 1029 def finish_now(self):
1030 if self.stats.active: 1030 if self.stats.active:
1031 bb.msg.note(1, bb.msg.domain.RunQueue, "Sending SIGINT to remaining %s tasks" % self.stats.active) 1031 bb.msg.note(1, bb.msg.domain.RunQueue, "Sending SIGTERM to remaining %s tasks" % self.stats.active)
1032 for k, v in self.build_pids.iteritems(): 1032 for k, v in self.build_pids.iteritems():
1033 try: 1033 try:
1034 os.kill(-k, signal.SIGINT) 1034 os.kill(-k, signal.SIGTERM)
1035 except: 1035 except:
1036 pass 1036 pass
1037 for pipe in self.build_pipes: 1037 for pipe in self.build_pipes: