From f4f2146370992fecf668ecce749b9a6c98794402 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 17 Apr 2018 14:44:50 +0800 Subject: update: fix dependency processing The previous commit broke the layer order, e.g.: A -> B -> C -> D The algorithm is checking the dependencies one by one, and until we find D, add D to layerquery_sorted, and add it "collections", the one in "collections" means it's dependencies are OK, then C, B and A will check against collections, so that update_layer.py will update them one by one. The previous commit added A/B/C/D to collections directly, so that when check against it, all the dependencies are met, thus broke the layer sorting, and then there would be failures if we pass layer A to update_layer.py before B, C and D (suppose they are newly to database). This commit fix the problem. BTW., why I use collections to record the one whose dependencies are matched, but not directly use layerquery_sorted, it is because collections contains both the ones to be added/updated and the ones in database, but layerquery_sorted only contains the ones to be updated/added. Signed-off-by: Robert Yang Signed-off-by: Paul Eggleton --- layerindex/update.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'layerindex/update.py') diff --git a/layerindex/update.py b/layerindex/update.py index f60b943cb2..07240abfb8 100755 --- a/layerindex/update.py +++ b/layerindex/update.py @@ -348,12 +348,11 @@ def main(): deps = re.search("^LAYERDEPENDS = \"(.*)\"", output, re.M).group(1) or '' recs = re.search("^LAYERRECOMMENDS = \"(.*)\"", output, re.M).group(1) or '' - collections.add((col, ver)) - deps_dict = utils.explode_dep_versions2(bitbakepath, deps + ' ' + recs) if len(deps_dict) == 0: # No depends, add it firstly layerquery_sorted.append(layer) + collections.add((col, ver)) continue deps_dict_all[layer] = {'requires': deps_dict, 'collection': col, 'version': ver} @@ -374,6 +373,7 @@ def main(): # All the depends are in collections: del(deps_dict_all[layer]) layerquery_sorted.append(layer) + collections.add((value['collection'], value['version'])) if not len(deps_dict_all): break -- cgit 1.2.3-korg