From 6e46d92224a7a4d668d507a9bf73cdb7206ba80c Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 8 Sep 2017 10:09:02 +1200 Subject: runqueue: fix BB_SETSCENE_ENFORCE with empty BB_SETSCENE_ENFORCE_WHITELIST The whitelist shouldn't have to be populated in order for the enforcement to work properly - check if the list is not None in order to determine whether the functionality is enabled or not since that is how the function that sets up the list behaves. Signed-off-by: Paul Eggleton --- lib/bb/runqueue.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 6b3a0fcfb..ae12c2504 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -1834,7 +1834,7 @@ class RunQueueExecuteTasks(RunQueueExecute): Run the tasks in a queue prepared by rqdata.prepare() """ - if self.rqdata.setscenewhitelist and not self.rqdata.setscenewhitelist_checked: + if self.rqdata.setscenewhitelist is not None and not self.rqdata.setscenewhitelist_checked: self.rqdata.setscenewhitelist_checked = True # Check tasks that are going to run against the whitelist @@ -2249,7 +2249,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute): self.scenequeue_updatecounters(task) def check_taskfail(self, task): - if self.rqdata.setscenewhitelist: + if self.rqdata.setscenewhitelist is not None: realtask = task.split('_setscene')[0] (mc, fn, taskname, taskfn) = split_tid_mcfn(realtask) pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn] @@ -2603,7 +2603,7 @@ def get_setscene_enforce_whitelist(d): def check_setscene_enforce_whitelist(pn, taskname, whitelist): import fnmatch - if whitelist: + if whitelist is not None: item = '%s:%s' % (pn, taskname) for whitelist_item in whitelist: if fnmatch.fnmatch(item, whitelist_item): -- cgit 1.2.3-korg