[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5960/8267] recipetool: create: skip values extracted from spec files containing macros

[Emmanuele Bassi <ebassi src gnome org>]

commit 4f152bdce98854531006587aa0638e3cc68c2dad
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Mon May 15 09:59:52 2017 +1200

    recipetool: create: skip values extracted from spec files containing macros
    
    If a value we extract from a spec file contains an unexpanded macro
    (e.g. %{macroname}) then we should discard it since we're not seeing the
    actual value and we don't have an easy way of expanding it at the
    moment.
    
    This fixes for example getting %{name} as the recipe name when running
    the following:
    
    recipetool create https://github.com/gavincarr/mod_auth_tkt.git
    
    (From OE-Core rev: eee56a19cda051da6267f808cd3a04a4c644acb3)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/recipetool/create_buildsys.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/scripts/lib/recipetool/create_buildsys.py b/scripts/lib/recipetool/create_buildsys.py
index e914e53..4743c74 100644
--- a/scripts/lib/recipetool/create_buildsys.py
+++ b/scripts/lib/recipetool/create_buildsys.py
@@ -863,6 +863,10 @@ class SpecFileRecipeHandler(RecipeHandler):
                             break
                     if len(foundvalues) == len(valuemap):
                         break
+        # Drop values containing unexpanded RPM macros
+        for k in list(foundvalues.keys()):
+            if '%' in foundvalues[k]:
+                del foundvalues[k]
         if 'PV' in foundvalues:
             if not validate_pv(foundvalues['PV']):
                 del foundvalues['PV']