Skip to contentSkip to conversation

bitbake: runqueue: add warning in invalidate task

PATCH In review Petter Mabäcker 2 participants 3 messages Jul 29, 2013

lore
Share & tools
lore

Petter Mabäcker

author
#0 lore raw

cover bitbake: runqueue: add warning in invalidate task

The following changes since commit 67864ca79da08df752487a3a4e1a975546da123d:

systemd: Remove systemd_unitdir if systemd is not in distro features (2013-07-24 11:35:39 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib petmab/bug/4877
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug/4877

Petter Mabäcker (1):
bitbake: runqueue: add warning in invalidate task

 bitbake/lib/bb/runqueue.py |    3 +++
 1 file changed, 3 insertions(+)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/1 bitbake: runqueue: add warning in invalidate task

Add a warning if 'bitbake -C' is executed with a task that does not exist.

Fixes [YOCTO #4877]

Signed-off-by Petter Mabäcker <[email protected]>
---
 bitbake/lib/bb/runqueue.py |    3 +++
 1 file changed, 3 insertions(+)
bitbake/lib/bb/runqueue.py +3 -0
index fce08ee..539e9af 100644
@@ -720,6 +720,9 @@ class RunQueueData:
 
         def invalidate_task(fn, taskname, error_nostamp):
             taskdep = self.dataCache.task_deps[fn]
+            fnid = self.taskData.getfn_id(fn)
+            if taskname not in taskData.tasks_lookup[fnid]:
+                logger.warn("Task %s does not exist, invalidate this task will have no effect" % taskname)
             if 'nostamp' in taskdep and taskname in taskdep['nostamp']:
                 if error_nostamp:
                     bb.fatal("Task %s is marked nostamp, cannot invalidate this task" % taskname)
Signature · 1 line
1.7.9.5
#2 lore raw

Hi Petter,

Quoted 21 lines · On Monday 29 July 2013 11:19:31 Petter Mabäcker wrote:

Add a warning if 'bitbake -C' is executed with a task that does not exist.

Fixes [YOCTO #4877]

Signed-off-by Petter Mabäcker <[email protected]>
---
 bitbake/lib/bb/runqueue.py |    3 +++
 1 file changed, 3 insertions(+)
bitbake/lib/bb/runqueue.py +3 -0
index fce08ee..539e9af 100644
@@ -720,6 +720,9 @@ class RunQueueData:
 
         def invalidate_task(fn, taskname, error_nostamp):
             taskdep = self.dataCache.task_deps[fn]
+            fnid = self.taskData.getfn_id(fn)
+            if taskname not in taskData.tasks_lookup[fnid]:
+                logger.warn("Task %s does not exist, invalidate this task
Quoted 4 lines

will have no effect" % taskname) if 'nostamp' in taskdep and taskname in taskdep['nostamp']: if error_nostamp:
bb.fatal("Task %s is marked nostamp, cannot invalidate
this task" % taskname)

This has now been merged with a slight tweak to the message and shortlog.

Thanks,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre