From f91b01fea8a0e2b32ccf9d3eea8468d5312633c4 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Tue, 18 Jun 2013 16:23:14 +0300 Subject: errors: fix a test case, and misanalysis of certain names the pinning11 changed when @repo got the leading @ on error messages. analyze_dep() now properly ignores conflict dependencies, as those names are usually intentionally left unassigned. --- src/commit.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/commit.c b/src/commit.c index 4c6e53a..7136627 100644 --- a/src/commit.c +++ b/src/commit.c @@ -516,6 +516,8 @@ static void analyze_deps(struct print_state *ps, struct apk_dependency_array *de foreach_array_item(d0, deps) { name0 = d0->name; + if (d0->conflict) + continue; if ((name0->state_int & (STATE_PRESENT | STATE_MISSING)) != 0) continue; name0->state_int |= STATE_MISSING; -- cgit v1.2.3-70-g09d2