From c971868360bfe089af2f42956a691b29c755db10 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Sep 2013 07:18:34 +0000 Subject: [PATCH] bitbake: siggen: Use lookup cache exclusively All the values we need are already guaranteed to be in the lookupcache so rather than fetch variables again, just use the cache. This gives a small performance improvement and simplifies the code. (Bitbake rev: 8ffaba61da7f195d7c3b64dce35b6a56272aecae) Signed-off-by: Richard Purdie --- bitbake/lib/bb/siggen.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index fb8b678508..c15ba28ead 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -91,8 +91,7 @@ class SignatureGeneratorBasic(SignatureGenerator): basehash = {} for task in tasklist: - data = d.getVar(task, False) - lookupcache[task] = data + data = lookupcache[task] if data is None: bb.error("Task %s from %s seems to be empty?!" % (task, fn)) @@ -115,16 +114,8 @@ class SignatureGeneratorBasic(SignatureGenerator): alldeps = sorted(seen) for dep in alldeps: data = data + dep - if dep in lookupcache: - var = lookupcache[dep] - elif dep[-1] == ']': - vf = dep[:-1].split('[') - var = d.getVarFlag(vf[0], vf[1], False) - lookupcache[dep] = var - else: - var = d.getVar(dep, False) - lookupcache[dep] = var - if var: + var = lookupcache[dep] + if var is not None: data = data + str(var) self.basehash[fn + "." + task] = hashlib.md5(data).hexdigest() taskdeps[task] = alldeps