From 51bdd2d5ba3a51269422b9bbdba6d0249f82e3dd Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 20 Sep 2017 16:41:28 +1200 Subject: tinfoil: ensure get_recipe_info() returns Null if recipe not found If a matching recipe is not found then return Null instead of raising KeyError because we were blindly using None as a key for pkg_fn. Signed-off-by: Paul Eggleton --- lib/bb/tinfoil.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py index fb2ee4ad9..8bac394ad 100644 --- a/lib/bb/tinfoil.py +++ b/lib/bb/tinfoil.py @@ -604,13 +604,16 @@ class Tinfoil: recipecache = self.cooker.recipecaches[mc] prov = self.find_best_provider(pn) fn = prov[3] - actual_pn = recipecache.pkg_fn[fn] - recipe = TinfoilRecipeInfo(recipecache, - self.config_data, - pn=actual_pn, - fn=fn, - fns=recipecache.pkg_pn[actual_pn]) - return recipe + if fn: + actual_pn = recipecache.pkg_fn[fn] + recipe = TinfoilRecipeInfo(recipecache, + self.config_data, + pn=actual_pn, + fn=fn, + fns=recipecache.pkg_pn[actual_pn]) + return recipe + else: + return None def parse_recipe(self, pn): """ -- cgit 1.2.3-korg