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/toastergui/api.py | |
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/toastergui/api.py')
-rw-r--r-- | bitbake/lib/toaster/toastergui/api.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastergui/api.py b/bitbake/lib/toaster/toastergui/api.py index 1bec56d468..564d595a1c 100644 --- a/bitbake/lib/toaster/toastergui/api.py +++ b/bitbake/lib/toaster/toastergui/api.py | |||
@@ -677,7 +677,13 @@ class XhrCustomRecipe(View): | |||
677 | recipe_path = os.path.join(layerpath, "recipes", "%s.bb" % | 677 | recipe_path = os.path.join(layerpath, "recipes", "%s.bb" % |
678 | recipe.name) | 678 | recipe.name) |
679 | with open(recipe_path, "w") as recipef: | 679 | with open(recipe_path, "w") as recipef: |
680 | recipef.write(recipe.generate_recipe_file_contents()) | 680 | content = recipe.generate_recipe_file_contents() |
681 | if not content: | ||
682 | # Delete this incomplete image recipe object | ||
683 | recipe.delete() | ||
684 | return error_response("recipe-parent-not-exist") | ||
685 | else: | ||
686 | recipef.write(recipe.generate_recipe_file_contents()) | ||
681 | 687 | ||
682 | return JsonResponse( | 688 | return JsonResponse( |
683 | {"error": "ok", | 689 | {"error": "ok", |