almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

lorax-composer: Fix customizations when creating a recipe

Browse Source 
This fixes the customizations list problem earlier than in
add_customizations.

In the recipe it should be [customizations] not [[customizations]]
which creates a list. If it was used that way grab the first element and
replace the list with it.

(cherry picked from commit 67007dfa60)

Related: rhbz#1709595
This commit is contained in:
Brian C. Lane 2019-04-10 16:09:09 -07:00
parent cf46a6db96
commit 86b595e13e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pylorax/api/recipes.py
View File

@ -234,6 +234,12 @@ def recipe_from_dict(recipe_dict):
description = recipe_dict["description"] description = recipe_dict["description"]
version = recipe_dict.get("version", None) version = recipe_dict.get("version", None)
customizations = recipe_dict.get("customizations", None) customizations = recipe_dict.get("customizations", None)
# [customizations] was incorrectly documented at first, so we have to support using it
# as [[customizations]] by grabbing the first element.
if isinstance(customizations, list):
customizations = customizations[0]
except KeyError as e: except KeyError as e:
raise RecipeError("There was a problem parsing the recipe: %s" % str(e)) raise RecipeError("There was a problem parsing the recipe: %s" % str(e))