[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5260/8267] bitbake: data/cooker: Sort output data shown by -e

[Emmanuele Bassi <ebassi src gnome org>]

commit 70f18264cec44914f6f790890281939ddbcea3b1
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Tue Mar 21 20:46:14 2017 +0000

    bitbake: 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.
    
    (Bitbake rev: baa417e44b009149eb1dfb07d5a488740b6e68ef)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/cooker.py |    2 +-
 bitbake/lib/bb/data.py   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 662a7ac..e3f5317 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/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/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index d145f1b..a85cb3a 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/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):