summaryrefslogtreecommitdiffstats
path: root/lib/toaster/orm
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2018-10-03 23:10:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-04 14:33:53 +0100
commitb310031972a53d0881a87a627f07bdcf7d9c6b79 (patch)
tree6454223d05c98930eb02da05e3a0e9bdbd8ec180 /lib/toaster/orm
parentabccd40536b366a418802c5ba8427454c2e3bb2c (diff)
downloadbitbake-b310031972a53d0881a87a627f07bdcf7d9c6b79.tar.gz
toaster: custom image enable layer add, protect pre-cloned layers
When creating custom image recipes, the layer add for new layers needs missing xhrLayerUrl data. Also, code is needed to check and inform user if the newly added layer has not been cloned yet, and provide helpful error message instead of the current frozen dialog. [YOCTO #12887] Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/toaster/orm')
-rw-r--r--lib/toaster/orm/models.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py
index be0bda5b1..849c22eed 100644
--- a/lib/toaster/orm/models.py
+++ b/lib/toaster/orm/models.py
@@ -1750,8 +1750,8 @@ class CustomImageRecipe(Recipe):
if base_recipe_path:
base_recipe = open(base_recipe_path, 'r').read()
else:
- raise IOError("Based on recipe file not found: %s" %
- base_recipe_path)
+ # Pass back None to trigger error message to user
+ return None
# Add a special case for when the recipe we have based a custom image
# recipe on requires another recipe.