[oe-commits] [openembedded-core] 41/47: recipetool: create: skip values extracted from spec files containing macros

[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 3ebb5bc781dbe015adc8cf888a553499f46f21d3
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: 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
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/recipetool/create_buildsys.py | 4 ++++
 1 file changed, 4 insertions(+)

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']

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