[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3082/8267] buildhistory: fix latest_srcrev in the common case



commit d0b0cf6cff23e8df42e041eb912a7d61b8797138
Author: Christopher Larson <chris_larson mentor com>
Date:   Mon Oct 17 16:02:53 2016 -0700

    buildhistory: fix latest_srcrev in the common case
    
    buildhistory was writing srcrevs.values() as SRCREV when only one
    srcrev/branch exists. This returns a view of the dictionary values in python
    3, and used to return a list in python 2, neither of which is an appropriate
    value for SRCREV. It was resulting in latest_srcrev files like this:
    
        # SRCREV = "346584bf6e38232be8773c24fd7dedcbd7b3d9ed"
        SRCREV = "dict_values(['346584bf6e38232be8773c24fd7dedcbd7b3d9ed'])"
    
    Which in turn would result in invalid output in buildhistory-collect-srcrevs.
    Fix by calling `next(iter())` on the `.values()`
    
    (From OE-Core rev: ef826a395612400924bbe49859d256b237ff59e1)
    
    Signed-off-by: Christopher Larson <chris_larson mentor com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/buildhistory.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 3a5bc2c..d82e9bb 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -833,7 +833,7 @@ python write_srcrev() {
                         f.write('# SRCREV_%s = "%s"\n' % (name, orig_srcrev))
                     f.write('SRCREV_%s = "%s"\n' % (name, srcrev))
             else:
-                f.write('SRCREV = "%s"\n' % srcrevs.values())
+                f.write('SRCREV = "%s"\n' % next(iter(srcrevs.values())))
             if len(tag_srcrevs) > 0:
                 for name, srcrev in tag_srcrevs.items():
                     f.write('# tag_%s = "%s"\n' % (name, srcrev))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]