summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-09-12 10:49:53 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-12 23:55:29 +0100
commit1bb49ce3228ae429c84830ecc0826092fd3bd072 (patch)
treef4ca85a180981306af47879704c0824efebc5b31 /bitbake/lib
parent28949d3f80de33c1c034d877691308c301e50bbd (diff)
downloadpoky-1bb49ce3228ae429c84830ecc0826092fd3bd072.tar.gz
bitbake: 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. (Bitbake rev: 7b1e79c352ca6eef1693d8abfacf7505544f1caa) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/runqueue.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 6b3a0fcfb6..ae12c25049 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1834,7 +1834,7 @@ class RunQueueExecuteTasks(RunQueueExecute):
1834 Run the tasks in a queue prepared by rqdata.prepare() 1834 Run the tasks in a queue prepared by rqdata.prepare()
1835 """ 1835 """
1836 1836
1837 if self.rqdata.setscenewhitelist and not self.rqdata.setscenewhitelist_checked: 1837 if self.rqdata.setscenewhitelist is not None and not self.rqdata.setscenewhitelist_checked:
1838 self.rqdata.setscenewhitelist_checked = True 1838 self.rqdata.setscenewhitelist_checked = True
1839 1839
1840 # Check tasks that are going to run against the whitelist 1840 # Check tasks that are going to run against the whitelist
@@ -2249,7 +2249,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
2249 self.scenequeue_updatecounters(task) 2249 self.scenequeue_updatecounters(task)
2250 2250
2251 def check_taskfail(self, task): 2251 def check_taskfail(self, task):
2252 if self.rqdata.setscenewhitelist: 2252 if self.rqdata.setscenewhitelist is not None:
2253 realtask = task.split('_setscene')[0] 2253 realtask = task.split('_setscene')[0]
2254 (mc, fn, taskname, taskfn) = split_tid_mcfn(realtask) 2254 (mc, fn, taskname, taskfn) = split_tid_mcfn(realtask)
2255 pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn] 2255 pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
@@ -2603,7 +2603,7 @@ def get_setscene_enforce_whitelist(d):
2603 2603
2604def check_setscene_enforce_whitelist(pn, taskname, whitelist): 2604def check_setscene_enforce_whitelist(pn, taskname, whitelist):
2605 import fnmatch 2605 import fnmatch
2606 if whitelist: 2606 if whitelist is not None:
2607 item = '%s:%s' % (pn, taskname) 2607 item = '%s:%s' % (pn, taskname)
2608 for whitelist_item in whitelist: 2608 for whitelist_item in whitelist:
2609 if fnmatch.fnmatch(item, whitelist_item): 2609 if fnmatch.fnmatch(item, whitelist_item):