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.
cute-signatures
Timo Teräs 2013-06-18 16:23:14 +03:00
parent 5725f656b0
commit f91b01fea8
2 changed files with 3 additions and 1 deletions

View File

@ -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;

View File

@ -6,5 +6,5 @@ add c>=3
@EXPECT
ERROR: unsatisfiable constraints:
c-3:
masked in: testing
masked in: @testing
satisfies: world[c>=3]