diff options
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 3ad0c0aa92..1959007bec 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -1173,8 +1173,7 @@ class RunQueueExecute: | |||
1173 | logger.critical(str(exc)) | 1173 | logger.critical(str(exc)) |
1174 | os._exit(1) | 1174 | os._exit(1) |
1175 | try: | 1175 | try: |
1176 | if not self.cooker.configuration.dry_run: | 1176 | ret = bb.build.exec_task(fn, taskname, the_data) |
1177 | ret = bb.build.exec_task(fn, taskname, the_data) | ||
1178 | os._exit(ret) | 1177 | os._exit(ret) |
1179 | except: | 1178 | except: |
1180 | os._exit(1) | 1179 | os._exit(1) |
@@ -1357,6 +1356,12 @@ class RunQueueExecuteTasks(RunQueueExecute): | |||
1357 | self.rqdata.get_user_idstring(task)) | 1356 | self.rqdata.get_user_idstring(task)) |
1358 | self.task_skip(task) | 1357 | self.task_skip(task) |
1359 | return True | 1358 | return True |
1359 | elif self.cooker.configuration.dry_run: | ||
1360 | self.runq_running[task] = 1 | ||
1361 | self.runq_buildable[task] = 1 | ||
1362 | self.stats.taskActive() | ||
1363 | self.task_complete(task) | ||
1364 | return True | ||
1360 | 1365 | ||
1361 | taskdep = self.rqdata.dataCache.task_deps[fn] | 1366 | taskdep = self.rqdata.dataCache.task_deps[fn] |
1362 | if 'noexec' in taskdep and taskname in taskdep['noexec']: | 1367 | if 'noexec' in taskdep and taskname in taskdep['noexec']: |
@@ -1648,9 +1653,6 @@ class RunQueueExecuteScenequeue(RunQueueExecute): | |||
1648 | self.task_skip(task) | 1653 | self.task_skip(task) |
1649 | return True | 1654 | return True |
1650 | 1655 | ||
1651 | logger.info("Running setscene task %d of %d (%s:%s)" % (self.stats.completed + self.stats.active + self.stats.failed + 1, | ||
1652 | self.stats.total, fn, taskname)) | ||
1653 | |||
1654 | startevent = sceneQueueTaskStarted(task, self.stats, self.rq) | 1656 | startevent = sceneQueueTaskStarted(task, self.stats, self.rq) |
1655 | bb.event.fire(startevent, self.cfgData) | 1657 | bb.event.fire(startevent, self.cfgData) |
1656 | 1658 | ||