[oe-commits] [openembedded-core] 04/13: lib/oe/recipeutils: patch_recipe(): fix replacing varflag values

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 9dc1671fbe7208c96a652059d21f04f60afadd94
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Wed Nov 28 17:16:15 2018 +1300

    lib/oe/recipeutils: patch_recipe(): fix replacing varflag values
    
    The code here wasn't correctly getting the variable history for
    varflags, so for example if you did a devtool upgrade on a recipe where
    the SRC_URI checksums were in the .inc file (typical for python recipes
    in order to support both python 2 and 3) then after the upgrade the
    new values would be set in the recipe and the old values were left in
    the .inc, which is not right. Teach the code here how to get the history
    for varflags so it works properly.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/recipeutils.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 9de291f..886ad26 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -81,11 +81,19 @@ def get_var_files(fn, varlist, d):
     """
     varfiles = {}
     for v in varlist:
-        history = d.varhistory.variable(v)
         files = []
-        for event in history:
-            if 'file' in event and not 'flag' in event:
-                files.append(event['file'])
+        if '[' in v:
+            varsplit = v.split('[')
+            varflag = varsplit[1].split(']')[0]
+            history = d.varhistory.variable(varsplit[0])
+            for event in history:
+                if 'file' in event and event.get('flag', '') == varflag:
+                    files.append(event['file'])
+        else:
+            history = d.varhistory.variable(v)
+            for event in history:
+                if 'file' in event and not 'flag' in event:
+                    files.append(event['file'])
         if files:
             actualfile = files[-1]
         else:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.