[oe-commits] [bitbake] 01/02: fixup4

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 92ee87ea54d734553df4671be0e55919dcd04a7c
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Jul 8 16:43:58 2019 +0100

    fixup4
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/runqueue.py | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 3b81a0e..8d9f1b4 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -1675,29 +1675,6 @@ class RunQueue:
                 output = bb.siggen.compare_sigfiles(latestmatch, match, recursecb)
                 bb.plain("\nTask %s:%s couldn't be used from the cache because:\n  We need hash %s, closest matching task was %s\n  " % (pn, taskname, h, prevh) + '\n  '.join(output))
 
-    def check_setscenewhitelist(self, tid):
-        # Check task that is going to run against the whitelist
-        (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
-        # Ignore covered tasks
-        if tid in self.tasks_covered:
-            return False
-        # Ignore stamped tasks
-        if self.rq.check_stamp_task(tid, taskname, cache=self.stampcache):
-            return False
-        # Ignore noexec tasks
-        taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn]
-        if 'noexec' in taskdep and taskname in taskdep['noexec']:
-            return False
-
-        pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
-        if not check_setscene_enforce_whitelist(pn, taskname, self.rqdata.setscenewhitelist):
-            if tid in self.rqdata.runq_setscene_tids:
-                msg = 'Task %s.%s attempted to execute unexpectedly and should have been setscened' % (pn, taskname)
-            else:
-                msg = 'Task %s.%s attempted to execute unexpectedly' % (pn, taskname)
-            logger.error(msg + '\nThis is usually due to missing setscene tasks. Those missing in this build were: %s' % str(self.scenequeue_notcovered))
-            return True
-        return False
 
 class RunQueueExecute:
 
@@ -2027,7 +2004,7 @@ class RunQueueExecute:
             (mc, fn, taskname, taskfn) = split_tid_mcfn(task)
 
             if self.rqdata.setscenewhitelist is not None:
-                if check_setscenewhitelist(task, self.rq, self.rqdata, self.stampcache, self.sched, self):
+                if self.check_setscenewhitelist(task):
                     self.task_fail(task, "setscene whitelist")
                     return True
 
@@ -2316,6 +2293,30 @@ class RunQueueExecute:
         #bb.note("Task %s: " % task + str(taskdepdata).replace("], ", "],\n"))
         return taskdepdata
 
+    def check_setscenewhitelist(self, tid):
+        # Check task that is going to run against the whitelist
+        (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
+        # Ignore covered tasks
+        if tid in self.tasks_covered:
+            return False
+        # Ignore stamped tasks
+        if self.rq.check_stamp_task(tid, taskname, cache=self.stampcache):
+            return False
+        # Ignore noexec tasks
+        taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn]
+        if 'noexec' in taskdep and taskname in taskdep['noexec']:
+            return False
+
+        pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
+        if not check_setscene_enforce_whitelist(pn, taskname, self.rqdata.setscenewhitelist):
+            if tid in self.rqdata.runq_setscene_tids:
+                msg = 'Task %s.%s attempted to execute unexpectedly and should have been setscened' % (pn, taskname)
+            else:
+                msg = 'Task %s.%s attempted to execute unexpectedly' % (pn, taskname)
+            logger.error(msg + '\nThis is usually due to missing setscene tasks. Those missing in this build were: %s' % pprint.pformat(self.scenequeue_notcovered))
+            return True
+        return False
+
 class SQData(object):
     def __init__(self):
         self.sq_harddeps = {}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.