MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

update_layer: fix handling of get_or_create()

Browse Source 
Use the more typical handling of the return of get_or_create() and check
if the item was created before saving.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2017-12-21 16:07:39 +13:00
parent 71206d54fe
commit d24cfadd08
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
layerindex/update_layer.py
View File

@ -85,9 +85,10 @@ def update_recipe_file(tinfoil, data, path, recipe, layerdir_start, repodir):
# Handle static build dependencies for this recipe # Handle static build dependencies for this recipe
static_dependencies = envdata.getVar("DEPENDS", True) or "" static_dependencies = envdata.getVar("DEPENDS", True) or ""
for dep in static_dependencies.split(): for dep in static_dependencies.split():
static_build_dependency = StaticBuildDep.objects.get_or_create(name=dep) static_build_dependency, created = StaticBuildDep.objects.get_or_create(name=dep)
static_build_dependency[0].save() if created:
static_build_dependency[0].recipes.add(recipe) static_build_dependency.save()
static_build_dependency.recipes.add(recipe)
# Handle the PACKAGECONFIG variables for this recipe # Handle the PACKAGECONFIG variables for this recipe
PackageConfig.objects.filter(recipe=recipe).delete() PackageConfig.objects.filter(recipe=recipe).delete()
@ -115,10 +116,11 @@ def update_recipe_file(tinfoil, data, path, recipe, layerdir_start, repodir):
# Handle the dynamic dependencies for the PACKAGECONFIG variable # Handle the dynamic dependencies for the PACKAGECONFIG variable
if package_config.build_deps: if package_config.build_deps:
for dep in package_config.build_deps.split(): for dep in package_config.build_deps.split():
dynamic_build_dependency = DynamicBuildDep.objects.get_or_create(name=dep) dynamic_build_dependency, created = DynamicBuildDep.objects.get_or_create(name=dep)
dynamic_build_dependency[0].save() if created:
dynamic_build_dependency[0].package_configs.add(package_config) dynamic_build_dependency.save()
dynamic_build_dependency[0].recipes.add(recipe) dynamic_build_dependency.package_configs.add(package_config)
dynamic_build_dependency.recipes.add(recipe)
# Get file dependencies within this layer # Get file dependencies within this layer
deps = envdata.getVar('__depends', True) deps = envdata.getVar('__depends', True)