diff options
author | Elliot Smith <elliot.smith@intel.com> | 2016-04-19 17:28:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-19 21:10:58 +0100 |
commit | 9abbb46e799c06757e03addd54e3f5d3c0fe2886 (patch) | |
tree | 27481fc0d75f5a0232936926f00856d45244262e /lib/toaster/toastergui/views.py | |
parent | dbb4f0282ded361baf9e5a0346e134bece5314b9 (diff) | |
download | bitbake-contrib-9abbb46e799c06757e03addd54e3f5d3c0fe2886.tar.gz |
toaster: only prevent duplicate custom image names within a project
We currently prevent the same name being used for multiple custom
images, but make the check across all projects. This means that
custom image names have to be unique across all projects in
the Toaster installation.
Modify how we validate the name of a custom image so that we
only prevent duplication of custom image names within a project,
while ensuring that the name of a custom image doesn't duplicate
the name of a recipe which is not a custom image recipe.
[YOCTO #9209]
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/toaster/toastergui/views.py')
-rwxr-xr-x | lib/toaster/toastergui/views.py | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index a11c9da5f..9744f4efa 100755 --- a/lib/toaster/toastergui/views.py +++ b/lib/toaster/toastergui/views.py @@ -2409,21 +2409,24 @@ if True: if re.search(r'[^a-z|0-9|-]', request.POST["name"]): return {"error": "invalid-name"} - # Are there any recipes with the name already? - for existing_recipe in Recipe.objects.filter( - name=request.POST["name"]): - try: - ci = CustomImageRecipe.objects.get(pk=existing_recipe.pk) - if ci.project == params["project"]: - return {"error": "already-exists" } - else: - # It is a CustomImageRecipe but not in our project - # this is fine so - continue - except: - # It isn't a CustomImageRecipe so is a recipe from - # another source. - return {"error": "already-exists" } + custom_images = CustomImageRecipe.objects.all() + + # Are there any recipes with this name already in our project? + existing_image_recipes_in_project = custom_images.filter( + name=request.POST["name"], project=params["project"]) + + if existing_image_recipes_in_project.count() > 0: + return {"error": "image-already-exists"} + + # Are there any recipes with this name which aren't custom + # image recipes? + custom_image_ids = custom_images.values_list('id', flat=True) + existing_non_image_recipes = Recipe.objects.filter( + Q(name=request.POST["name"]) & ~Q(pk__in=custom_image_ids) + ) + + if existing_non_image_recipes.count() > 0: + return {"error": "recipe-already-exists"} # create layer 'Custom layer' and verion if needed layer = Layer.objects.get_or_create( |