From bf1d7739618dabf3872a868230c0112b9ad2a2c0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 27 Feb 2012 18:54:12 +0000 Subject: bitbake/runqueue: make dry-run do everything except execute Make dry-run do everything except executing the task, instead of cutting it off earlier. This fully tests the code path for running the child task (parsing and fakeroot), as well as enabling future functionality such as using dry-run to produce signature files. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'lib/bb/runqueue.py') diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index f08f93aef..0e5d5c35a 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -1187,7 +1187,8 @@ class RunQueueExecute: logger.critical(str(exc)) os._exit(1) try: - ret = bb.build.exec_task(fn, taskname, the_data) + if not self.cooker.configuration.dry_run: + ret = bb.build.exec_task(fn, taskname, the_data) os._exit(ret) except: os._exit(1) @@ -1370,12 +1371,6 @@ class RunQueueExecuteTasks(RunQueueExecute): self.rqdata.get_user_idstring(task)) self.task_skip(task) return True - elif self.cooker.configuration.dry_run: - self.runq_running[task] = 1 - self.runq_buildable[task] = 1 - self.stats.taskActive() - self.task_complete(task) - return True taskdep = self.rqdata.dataCache.task_deps[fn] if 'noexec' in taskdep and taskname in taskdep['noexec']: -- cgit 1.2.3-korg