mirror of
git://git.yoctoproject.org/layerindex-web.git
synced 2025-07-19 20:59:01 +02:00
utils.py: fix remove obsolete dependencies
The obsolete dependency is the one which is in database but not in conf/layer.conf anymore. The old code had a problem for newly created layerbranch, the new layerbranch has no dependencies, so no need remove. And it had a side effect was that when need_remove was cleaned up, it would be set again in the next for loop, thus might wrongly remove dependencies. This patch can fix the problem. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
parent
11e5010b13
commit
ab4693f8ab
|
@ -122,7 +122,7 @@ def _add_dependency(var, name, layerbranch, config_data, logger=None, required=T
|
||||||
logger.debug('Error parsing %s_%s for %s\n%s' % (var, var_name, layer_name, str(vse)))
|
logger.debug('Error parsing %s_%s for %s\n%s' % (var, var_name, layer_name, str(vse)))
|
||||||
return
|
return
|
||||||
|
|
||||||
need_remove = None
|
need_remove = LayerDependency.objects.filter(layerbranch=layerbranch).filter(required=required)
|
||||||
for dep, ver_list in list(dep_dict.items()):
|
for dep, ver_list in list(dep_dict.items()):
|
||||||
ver_str = None
|
ver_str = None
|
||||||
if ver_list:
|
if ver_list:
|
||||||
|
@ -142,9 +142,7 @@ def _add_dependency(var, name, layerbranch, config_data, logger=None, required=T
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Preparing to remove obsolete ones
|
# Preparing to remove obsolete ones
|
||||||
if not need_remove:
|
if need_remove:
|
||||||
need_remove = LayerDependency.objects.filter(layerbranch=layerbranch).filter(required=required).exclude(dependency=dep_layer)
|
|
||||||
else:
|
|
||||||
need_remove = need_remove.exclude(dependency=dep_layer)
|
need_remove = need_remove.exclude(dependency=dep_layer)
|
||||||
|
|
||||||
# Skip existing entries.
|
# Skip existing entries.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user