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: ensure removed recipe dependencies are removed from db

Browse Source 
If a recipe dependency (either static or dynamic) is removed from the
recipe when it is parsed, then we should ensure it gets removed from the
database as well.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2019-12-02 16:02:34 +13:00
parent 365cfde783
commit 4fd3e9c923
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layerindex/recipeparse.py
View File

@ -154,17 +154,23 @@ def detect_file_type(path, subdir_start):
return (None, None, None)
def handle_recipe_depends(recipe, depends, packageconfig_opts):
def handle_recipe_depends(recipe, depends, packageconfig_opts, logger):
from layerindex.models import StaticBuildDep, PackageConfig, DynamicBuildDep
# Handle static build dependencies for this recipe
staticdeps = list(recipe.staticbuilddep_set.values_list('name', flat=True))
for dep in depends.split():
static_build_dependency, created = StaticBuildDep.objects.get_or_create(name=dep)
if created:
static_build_dependency.save()
static_build_dependency.recipes.add(recipe)
if dep in staticdeps:
staticdeps.remove(dep)
for dep in staticdeps:
StaticBuildDep.objects.get(name=dep).recipes.remove(recipe)
# Handle the PACKAGECONFIG variables for this recipe
dynamicdeps = list(recipe.dynamicbuilddep_set.values_list('name', flat=True))
PackageConfig.objects.filter(recipe=recipe).delete()
for key, value in packageconfig_opts.items():
if key == "doc":
@ -194,6 +200,10 @@ def handle_recipe_depends(recipe, depends, packageconfig_opts):
dynamic_build_dependency.save()
dynamic_build_dependency.package_configs.add(package_config)
dynamic_build_dependency.recipes.add(recipe)
if dep in dynamicdeps:
dynamicdeps.remove(dep)
for dep in dynamicdeps:
DynamicBuildDep.objects.get(name=dep).recipes.remove(recipe)
def handle_recipe_provides(recipe):
from layerindex.models import ExtendedProvide

2
layerindex/update_layer.py
View File

@ -148,7 +148,7 @@ def update_recipe_file(tinfoil, data, path, recipe, layerdir_start, repodir, sto
for url in old_urls:
recipe.source_set.filter(url=url).delete()
recipeparse.handle_recipe_depends(recipe, envdata.getVar('DEPENDS', True) or '', envdata.getVarFlags('PACKAGECONFIG'))
recipeparse.handle_recipe_depends(recipe, envdata.getVar('DEPENDS', True) or '', envdata.getVarFlags('PACKAGECONFIG'), logger)
recipeparse.handle_recipe_provides(recipe)