MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-06 21:54:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

import_layers: delete non-matching LayerBranch objects

Browse Source 
If a LayerBranch is on a branch that is in the remote layer index (and
that branch is in any branch list specified with -b/--branch) and the
layer for the LayerBranch is not found in the remote layerindex then it
should be deleted, otherwise we could end up with stale data.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2019-08-06 11:11:49 +12:00
parent 0d62b19a38
commit 40aada94e0
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layerindex/tools/import_layers.py
View File

@ -279,6 +279,12 @@ def main():
for idv in existing_filedeps: for idv in existing_filedeps:
RecipeFileDependency.objects.filter(id=idv).delete() RecipeFileDependency.objects.filter(id=idv).delete()
# Get list of layerbranches that currently exist, so we can delete any that
# we don't find in the remote layer index (assuming they are on branches
# that *do* exist in the remote index and are in the list specified by
# -b/--branch, if any)
existing_layerbranches = list(LayerBranch.objects.filter(branch__in=branch_idmap.values()).values_list('id', flat=True))
exclude_fields = ['id', 'layer', 'branch', 'yp_compatible_version', 'updated'] exclude_fields = ['id', 'layer', 'branch', 'yp_compatible_version', 'updated']
for layerbranchjs in jsdata: for layerbranchjs in jsdata:
branch = branch_idmap.get(layerbranchjs['branch'], None) branch = branch_idmap.get(layerbranchjs['branch'], None)
@ -296,6 +302,7 @@ def main():
# The layerbranch already exists (this will occur for layers # The layerbranch already exists (this will occur for layers
# that already existed, since we need to have those in layer_idmap # that already existed, since we need to have those in layer_idmap
# to be able to import layer dependencies) # to be able to import layer dependencies)
existing_layerbranches.remove(layerbranch.id)
if layerbranchjs['updated'] <= layerbranch.updated: if layerbranchjs['updated'] <= layerbranch.updated:
logger.debug('Skipping layerbranch %s, already up-to-date' % layerbranchjs['id']) logger.debug('Skipping layerbranch %s, already up-to-date' % layerbranchjs['id'])
layerbranch_idmap[layerbranchjs['id']] = layerbranch layerbranch_idmap[layerbranchjs['id']] = layerbranch
@ -365,6 +372,11 @@ def main():
exclude_fields=['id', 'layerbranch', 'updated'], exclude_fields=['id', 'layerbranch', 'updated'],
key_fields=['path']) key_fields=['path'])
for idv in existing_layerbranches:
layerbranch = LayerBranch.objects.get(id=idv)
if layer_re is None or layer_re.match(layerbranch.layer.name):
logger.debug('Deleting layerbranch %s' % layerbranch)
layerbranch.delete()
# Get layer dependencies # Get layer dependencies
logger.debug('Importing layer dependencies') logger.debug('Importing layer dependencies')