diff options
author | David Reyna <David.Reyna@windriver.com> | 2018-10-03 23:10:51 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-04 23:00:24 +0100 |
commit | fa8ade3695b836fb788c57c0d56b546b47f1603a (patch) | |
tree | 8f98535c7d73496867c2850012fd3d2cc2dc30fe /bitbake/lib/toaster/orm | |
parent | f0cf4b0972173d5463a31a2543098cee7d6e11c3 (diff) | |
download | poky-fa8ade3695b836fb788c57c0d56b546b47f1603a.tar.gz |
bitbake: 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]
(Bitbake rev: b310031972a53d0881a87a627f07bdcf7d9c6b79)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/orm')
-rw-r--r-- | bitbake/lib/toaster/orm/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index be0bda5b15..849c22eede 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
@@ -1750,8 +1750,8 @@ class CustomImageRecipe(Recipe): | |||
1750 | if base_recipe_path: | 1750 | if base_recipe_path: |
1751 | base_recipe = open(base_recipe_path, 'r').read() | 1751 | base_recipe = open(base_recipe_path, 'r').read() |
1752 | else: | 1752 | else: |
1753 | raise IOError("Based on recipe file not found: %s" % | 1753 | # Pass back None to trigger error message to user |
1754 | base_recipe_path) | 1754 | return None |
1755 | 1755 | ||
1756 | # Add a special case for when the recipe we have based a custom image | 1756 | # Add a special case for when the recipe we have based a custom image |
1757 | # recipe on requires another recipe. | 1757 | # recipe on requires another recipe. |