From 702b42a47904f2378dd819e7463b3206883c2651 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 25 May 2015 08:53:52 +0100 Subject: 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. Signed-off-by: Richard Purdie --- lib/bb/data.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/bb/data.py') diff --git a/lib/bb/data.py b/lib/bb/data.py index 82eefef1a..218998a0a 100644 --- a/lib/bb/data.py +++ b/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): -- cgit 1.2.3-korg