From 6c492bc676d676ebc718a3ea4afeaad6ec93ae24 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Mon, 14 Apr 2014 19:05:59 +0200 Subject: [PATCH] fix type introduced in commit #bbdec95b Also makes the code deal correctly with non-canonicalized filename dependencies. --- src/pool.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pool.c b/src/pool.c index 01f95e6..946f6da 100644 --- a/src/pool.c +++ b/src/pool.c @@ -1421,10 +1421,8 @@ addfileprovides_cb(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyV if (value->id >= data->dirpool.ndirs || !MAPTST(&cbd->useddirs, value->id)) return 0; for (i = 0; i < cbd->nfiles; i++) - if (cbd->dids[i] != value->id && !strcmp(cbd->names[i], value->str)) - break; - if (i < cbd->nfiles) - s->provides = repo_addid_dep(s->repo, s->provides, cbd->ids[i], SOLVABLE_FILEMARKER); + if (cbd->dids[i] == value->id && !strcmp(cbd->names[i], value->str)) + s->provides = repo_addid_dep(s->repo, s->provides, cbd->ids[i], SOLVABLE_FILEMARKER); return 0; } -- 2.7.4