summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-11-13 11:00:25 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-21 13:06:12 +0000
commitd6829f4f6c1b83d438ff114ca92592a5efe7f535 (patch)
tree4e2320e3716df1b3ca70f1dfa2d80eca4fb7650a /scripts/lib
parent8d2e66817a6e5cea5a0146f2804e703402de44dc (diff)
downloadpoky-d6829f4f6c1b83d438ff114ca92592a5efe7f535.tar.gz
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 (From OE-Core rev: ae62a9953e219df5147ed4a5ae3f4163d51cff28) 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>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/recipetool/create_buildsys_python.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/lib/recipetool/create_buildsys_python.py b/scripts/lib/recipetool/create_buildsys_python.py
index ec5449bee9..5bd2aa337c 100644
--- a/scripts/lib/recipetool/create_buildsys_python.py
+++ b/scripts/lib/recipetool/create_buildsys_python.py
@@ -356,6 +356,8 @@ class PythonRecipeHandler(RecipeHandler):
356 # Naive mapping of setup() arguments to PKG-INFO field names 356 # Naive mapping of setup() arguments to PKG-INFO field names
357 for d in [info, non_literals]: 357 for d in [info, non_literals]:
358 for key, value in list(d.items()): 358 for key, value in list(d.items()):
359 if key is None:
360 continue
359 new_key = _map(key) 361 new_key = _map(key)
360 if new_key != key: 362 if new_key != key:
361 del d[key] 363 del d[key]