From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 16 Sep 2013 07:25:08 +0000 (+0000)
Subject: data_smart: use the expand_cache in VariableParse
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f682b8b83d21d576160bac8dc57c4c989b4dc555;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

data_smart: use the expand_cache in VariableParse

When in VariableParse, use the expand_cache if possible rather than looking
up data. Ultimately it would come from the same place but this short cuts
a heavily used code block for speed improvements.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 9be5d5e270c..a6a4b6c8ae1 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -94,6 +94,11 @@ class VariableParse:
             if self.varname and key:
                 if self.varname == key:
                     raise Exception("variable %s references itself!" % self.varname)
+            if key in self.d.expand_cache:
+                varparse = self.d.expand_cache[key]
+                self.references |= varparse.references
+                self.execs |= varparse.execs
+                return varparse.value
             var = self.d.getVar(key, True)
             if var is not None:
                 self.references.add(key)