summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2014-04-14 19:05:59 +0200
committerMichael Schroeder <mls@suse.de>2014-04-14 19:05:59 +0200
commit6c492bc676d676ebc718a3ea4afeaad6ec93ae24 (patch)
tree89c8a43ed0bbcf2738c874895f75d586cb7d8292
parent294b4f8038f0914011ebd93e77383690c862e19c (diff)
downloadlibsolv-6c492bc676d676ebc718a3ea4afeaad6ec93ae24.tar.gz
libsolv-6c492bc676d676ebc718a3ea4afeaad6ec93ae24.tar.bz2
libsolv-6c492bc676d676ebc718a3ea4afeaad6ec93ae24.zip
fix type introduced in commit #bbdec95b
Also makes the code deal correctly with non-canonicalized filename dependencies.
-rw-r--r--src/pool.c6
1 files 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;
}