summaryrefslogtreecommitdiffstats
path: root/lib/bb/data_smart.py
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2013-09-16 07:40:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-17 14:09:38 +0100
commita4d81e44a7cd3dafb0bf12f7cac5ff511db18e60 (patch)
treefcd39a262e2687e08f5c23bfece98365a985befc /lib/bb/data_smart.py
parentf41f46f7eaa6889edeb3a4e4ddedc07084686c60 (diff)
downloadbitbake-contrib-a4d81e44a7cd3dafb0bf12f7cac5ff511db18e60.tar.gz
data_smart: Add explict None checks
Simple if xxx checks end up calling len(xxx). We're interested in the specific case of None which means we can break out the iterator much earlier after the first item. This adds in the specific tests for None in what is a hot path in the data store code which gives small performance gains. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/data_smart.py')
-rw-r--r--lib/bb/data_smart.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 1bb186e10..970e404b1 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -588,7 +588,7 @@ class DataSmart(MutableMapping):
def getVarFlag(self, var, flag, expand=False, noweakdefault=False):
local_var = self._findVar(var)
value = None
- if local_var:
+ if local_var is not None:
if flag in local_var:
value = copy.copy(local_var[flag])
elif flag == "_content" and "defaultval" in local_var and not noweakdefault:
@@ -599,7 +599,7 @@ class DataSmart(MutableMapping):
if flag == "_content":
cachename = var
value = self.expand(value, cachename)
- if value and flag == "_content" and local_var and "_removeactive" in local_var:
+ if value is not None and flag == "_content" and local_var is not None and "_removeactive" in local_var:
filtered = filter(lambda v: v not in local_var["_removeactive"],
value.split(" "))
value = " ".join(filtered)