diff options
| -rw-r--r-- | src/commit.c | 2 | ||||
| -rw-r--r-- | test/pinning11.test | 2 |
2 files changed, 3 insertions, 1 deletions
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; diff --git a/test/pinning11.test b/test/pinning11.test index 794eed5..c163956 100644 --- a/test/pinning11.test +++ b/test/pinning11.test @@ -6,5 +6,5 @@ add c>=3 @EXPECT ERROR: unsatisfiable constraints: c-3: - masked in: testing + masked in: @testing satisfies: world[c>=3] |