summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-06-18 16:23:14 +0300
committerTimo Teräs <timo.teras@iki.fi>2013-06-18 16:23:14 +0300
commitf91b01fea8a0e2b32ccf9d3eea8468d5312633c4 (patch)
tree476950f65bcbd2a9e5ccd417a24ead119e2ba05a /src
parent5725f656b01c734580dd9d866a2855a9c333a441 (diff)
downloadapk-tools-f91b01fea8a0e2b32ccf9d3eea8468d5312633c4.tar.gz
apk-tools-f91b01fea8a0e2b32ccf9d3eea8468d5312633c4.tar.bz2
apk-tools-f91b01fea8a0e2b32ccf9d3eea8468d5312633c4.tar.xz
apk-tools-f91b01fea8a0e2b32ccf9d3eea8468d5312633c4.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/commit.c2
1 files changed, 2 insertions, 0 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;