From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 25 May 2015 07:53:52 +0000 (+0100)
Subject: bitbake: data: Move warning code to the first loop for performance
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a32937c50178a3437d59323644c8b76fa56f6657;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake: data: Move warning code to the first loop for performance

By doing this we can take advantage of the expansion cache before
starting write operations on the data store.

(Bitbake rev: 702b42a47904f2378dd819e7463b3206883c2651)

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

diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 82eefef1a60..218998a0af0 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -156,17 +156,17 @@ def expandKeys(alterdata, readdata = None):
         if key == ekey:
             continue
         todolist[key] = ekey
+        newval = alterdata.getVar(ekey, 0)
+        if newval:
+            val = alterdata.getVar(key, 0)
+            if val is not None and newval is not None:
+                bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval))
 
     # These two for loops are split for performance to maximise the
     # usefulness of the expand cache
 
     for key in todolist:
         ekey = todolist[key]
-        newval = alterdata.getVar(ekey, 0)
-        if newval:
-            val = alterdata.getVar(key, 0)
-            if val is not None and newval is not None:
-                bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval))
         alterdata.renameVar(key, ekey)
 
 def inheritFromOS(d, savedenv, permitted):