[oe-commits] [openembedded-core] 99/122: recipetool: create: fix failure handling included dicts

[git at git.openembedded.org]

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

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

commit 49b2d571da88fb2afce71835276523ed3538d31f
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Mon Nov 13 11:00:25 2017 +1300

    recipetool: create: fix failure handling included dicts
    
    If a setup dict in a python setup.py file pulled in the contents of
    another dict (e.g.  **otherdict), then we got an error when mapping
    the keys because the key is None in that case. Skip those keys to avoid
    the error (we pick up the values directly in any case).
    
    A quick reproducer for this issue:
    
    recipetool create https://files.pythonhosted.org/packages/source/p/pyqtgraph/pyqtgraph-0.10.0.tar.gz
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    (cherry picked from commit ae62a9953e219df5147ed4a5ae3f4163d51cff28)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 scripts/lib/recipetool/create_buildsys_python.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/lib/recipetool/create_buildsys_python.py b/scripts/lib/recipetool/create_buildsys_python.py
index ec5449b..5bd2aa3 100644
--- a/scripts/lib/recipetool/create_buildsys_python.py
+++ b/scripts/lib/recipetool/create_buildsys_python.py
@@ -356,6 +356,8 @@ class PythonRecipeHandler(RecipeHandler):
         # Naive mapping of setup() arguments to PKG-INFO field names
         for d in [info, non_literals]:
             for key, value in list(d.items()):
+                if key is None:
+                    continue
                 new_key = _map(key)
                 if new_key != key:
                     del d[key]

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