diff options
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 6 |
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 | ||
2604 | def check_setscene_enforce_whitelist(pn, taskname, whitelist): | 2604 | def 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): |