From: Michael Schroeder <mls@suse.de>
Date: Mon, 14 Apr 2014 17:05:59 +0000 (+0200)
Subject: fix type introduced in commit #bbdec95b
X-Git-Tag: 0.6.4~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c492bc676d676ebc718a3ea4afeaad6ec93ae24;p=thirdparty%2Flibsolv.git

fix type introduced in commit #bbdec95b

Also makes the code deal correctly with non-canonicalized
filename dependencies.
---

diff --git a/src/pool.c b/src/pool.c
index 01f95e66..946f6dab 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;
 }