From 0e3674dbde4e2262e17cde5e30a2fbfaa58f120a Mon Sep 17 00:00:00 2001 From: hyokeun Date: Fri, 19 Jan 2018 11:11:46 +0900 Subject: [PATCH] Fix duplicated calculation routine Change-Id: I4557f38171b82ffb9d4dceabe11003d5b0ae928d --- job_create_snapshot.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/job_create_snapshot.py b/job_create_snapshot.py index 07c7a97..eaf7000 100755 --- a/job_create_snapshot.py +++ b/job_create_snapshot.py @@ -287,7 +287,13 @@ def make_repo(project, backenddb, base_path, live_repo_base): # Add Manifest data manifestdata.extend(list(set([ (t.keys()[0],t[t.keys()[0]][0], t[t.keys()[0]][1]) for t in manifest_items]))) # Check duplicated items - path_list = [ t.keys()[0] for t in manifest_items if t.keys()[0] ] + + manifest_items_no_pkg_name = [] + for m in manifest_items: + if {m.keys()[0]: m[m.keys()[0]][0]} in manifest_items_no_pkg_name: + continue + manifest_items_no_pkg_name.append({m.keys()[0]: m[m.keys()[0]][0]}) + path_list = [ t.keys()[0] for t in manifest_items_no_pkg_name if t.keys()[0] ] duplicated = set([x for x in path_list if path_list.count(x) > 1]) duplicated_report.extend(list(duplicated)) #if len(duplicated) >= 1: -- 2.7.4