diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-16 15:14:13 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-16 15:14:13 +0000 |
| commit | ace52b0da36d2909c1aaf344ff5f321a8de777ba (patch) | |
| tree | a421a22c93c94aa2dc9f4d02a2c637993368dfd7 /bitbake | |
| parent | e497b89cf3325d82fb2f96df92af019c7d487a09 (diff) | |
| download | openembedded-core-ace52b0da36d2909c1aaf344ff5f321a8de777ba.tar.gz openembedded-core-ace52b0da36d2909c1aaf344ff5f321a8de777ba.tar.bz2 openembedded-core-ace52b0da36d2909c1aaf344ff5f321a8de777ba.zip | |
bitbake/runqueue.py: We should just failoutright in scenequeue for noexec tasks, not skip them so stamps are created
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index d605b310ff..9b75dff00e 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -909,9 +909,13 @@ class RunQueue: if t3 and t3 > t2: continue if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist): - if not t2 or t1 < t2: - bb.msg.debug(2, bb.msg.domain.RunQueue, "Stampfile %s < %s (or does not exist)" % (stampfile, stampfile2)) + if not t2: + bb.msg.debug(2, bb.msg.domain.RunQueue, "Stampfile %s does not exist" % (stampfile2)) iscurrent = False + if t1 < t2: + bb.msg.debug(2, bb.msg.domain.RunQueue, "Stampfile %s < %s" % (stampfile, stampfile2)) + iscurrent = False + return iscurrent def execute_runqueue(self): @@ -1368,7 +1372,6 @@ class RunQueueExecuteScenequeue(RunQueueExecute): taskdep = self.rqdata.dataCache.task_deps[fn] if 'noexec' in taskdep and taskname in taskdep['noexec']: noexec.append(task) - self.task_skip(task) continue sq_fn.append(fn) sq_hashfn.append(self.rqdata.dataCache.hashfn[fn]) @@ -1384,7 +1387,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute): valid_new.append(sq_task[v]) for task in range(len(self.sq_revdeps)): - if task not in valid_new and task not in noexec: + if task not in valid_new: bb.msg.debug(2, bb.msg.domain.RunQueue, "No package found so skipping setscene task %s" % (self.rqdata.get_user_idstring(self.rqdata.runq_setscene[task]))) self.task_failoutright(task) |