From 7771bb93b2a2b2b9ef6835785d51fb2bfe1ea584 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 27 Jan 2016 21:32:13 +0100 Subject: [PATCH] graph-depends: fix handling of "virtual" in exclude_list The condition to determine if a virtual package should be excluded from the list due to "virtual" being passed in --exclude is under a loop iterating over each entry of the exclude_list, but it doesn't use the iterator of this list. Indeed, the condition contains: "virtual" in exclude_list which checks automatically if "virtual" was passed in the list. Due to this, there is no need for this check to be within the "for p in exclude_list" iteration. This commit fixes that by moving the check outside of the loop. Signed-off-by: Thomas Petazzoni Tested-by: "Yann E. MORIN" Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/scripts/graph-depends | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index efb73d28f6..fcf3ccab17 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -403,15 +403,14 @@ def print_pkg_deps(depth, pkg): return if max_depth == 0 or depth < max_depth: for d in dict_deps[pkg]: + if dict_version.get(d) == "virtual" \ + and "virtual" in exclude_list: + continue add = True for p in exclude_list: if fnmatch(d,p): add = False break - if dict_version.get(d) == "virtual" \ - and "virtual" in exclude_list: - add = False - break if add: outfile.write("%s -> %s\n" % (pkg_node_name(pkg), pkg_node_name(d))) print_pkg_deps(depth+1, d)