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
parent
5725f656b0
commit
f91b01fea8
|
@ -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;
|
||||
|
|
|
@ -6,5 +6,5 @@ add c>=3
|
|||
@EXPECT
|
||||
ERROR: unsatisfiable constraints:
|
||||
c-3:
|
||||
masked in: testing
|
||||
masked in: @testing
|
||||
satisfies: world[c>=3]
|
||||
|
|
Loading…
Reference in New Issue