aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-21 20:46:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-21 21:10:13 +0000
commitbaa417e44b009149eb1dfb07d5a488740b6e68ef (patch)
treeb3220aabd58386bb236347326d273f47e44add3f
parent945fa980e027753df2c21d84eb63dcaddb2caaee (diff)
downloadbitbake-baa417e44b009149eb1dfb07d5a488740b6e68ef.tar.gz
data/cooker: Sort output data shown by -e
Displaying the environment data in a sorted manner makes it easier to compare data between different setups and means you can know where to find specific entries. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/cooker.py2
-rw-r--r--lib/bb/data.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 662a7ac07..e3f5317f7 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -648,7 +648,7 @@ class BBCooker:
# emit the metadata which isnt valid shell
data.expandKeys(envdata)
- for e in envdata.keys():
+ for e in sorted(envdata.keys()):
if envdata.getVarFlag(e, 'func', False) and envdata.getVarFlag(e, 'python', False):
logger.plain("\npython %s () {\n%s}\n", e, envdata.getVar(e, False))
diff --git a/lib/bb/data.py b/lib/bb/data.py
index d145f1b0a..a85cb3abf 100644
--- a/lib/bb/data.py
+++ b/lib/bb/data.py
@@ -196,7 +196,7 @@ def emit_env(o=sys.__stdout__, d = init(), all=False):
keys = sorted((key for key in d.keys() if not key.startswith("__")), key=isfunc)
grouped = groupby(keys, isfunc)
for isfunc, keys in grouped:
- for key in keys:
+ for key in sorted(keys):
emit_var(key, o, d, all and not isfunc) and o.write('\n')
def exported_keys(d):