diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-10 13:13:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-10 13:24:04 +0000 |
commit | cd382f95461454fecae3d9811a9f2386626e5418 (patch) | |
tree | 9dd6b5786ce5ba361fd5824b8417c1c0c18461ef /bitbake/lib/bb/runqueue.py | |
parent | 2c2d160c889ac03e47f58219375d558b8b9ce358 (diff) | |
download | poky-cd382f95461454fecae3d9811a9f2386626e5418.tar.gz |
runqueue.py: Drop unneeded import and improve quieterrors handling as per upstream bitbake
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 054191b8c9..2b37619ae3 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -25,7 +25,6 @@ Handles preparation and execution of a queue of tasks | |||
25 | import copy | 25 | import copy |
26 | import os | 26 | import os |
27 | import sys | 27 | import sys |
28 | import subprocess | ||
29 | import signal | 28 | import signal |
30 | import stat | 29 | import stat |
31 | import fcntl | 30 | import fcntl |
@@ -1055,7 +1054,7 @@ class RunQueueExecute: | |||
1055 | self.rq.state = runQueueComplete | 1054 | self.rq.state = runQueueComplete |
1056 | return | 1055 | return |
1057 | 1056 | ||
1058 | def fork_off_task(self, fn, task, taskname): | 1057 | def fork_off_task(self, fn, task, taskname, quieterrors=False): |
1059 | the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.get_file_appends(fn), self.cooker.configuration.data) | 1058 | the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.get_file_appends(fn), self.cooker.configuration.data) |
1060 | 1059 | ||
1061 | env = bb.data.export_vars(the_data) | 1060 | env = bb.data.export_vars(the_data) |
@@ -1115,7 +1114,7 @@ class RunQueueExecute: | |||
1115 | #newso = open(logout, 'w') | 1114 | #newso = open(logout, 'w') |
1116 | #os.dup2(newso.fileno(), sys.stdout.fileno()) | 1115 | #os.dup2(newso.fileno(), sys.stdout.fileno()) |
1117 | #os.dup2(newso.fileno(), sys.stderr.fileno()) | 1116 | #os.dup2(newso.fileno(), sys.stderr.fileno()) |
1118 | if taskname.endswith("_setscene"): | 1117 | if quieterrors: |
1119 | the_data.setVarFlag(taskname, "quieterrors", "1") | 1118 | the_data.setVarFlag(taskname, "quieterrors", "1") |
1120 | 1119 | ||
1121 | bb.data.setVar("BB_WORKERCONTEXT", "1", the_data) | 1120 | bb.data.setVar("BB_WORKERCONTEXT", "1", the_data) |
@@ -1569,6 +1568,9 @@ class RunQueueExecuteScenequeue(RunQueueExecute): | |||
1569 | self.rq.state = runQueueRunInit | 1568 | self.rq.state = runQueueRunInit |
1570 | return True | 1569 | return True |
1571 | 1570 | ||
1571 | def fork_off_task(self, fn, task, taskname): | ||
1572 | return RunQueueExecute.fork_off_task(self, fn, task, taskname, quieterrors=True) | ||
1573 | |||
1572 | class TaskFailure(Exception): | 1574 | class TaskFailure(Exception): |
1573 | """ | 1575 | """ |
1574 | Exception raised when a task in a runqueue fails | 1576 | Exception raised when a task in a runqueue fails |