From: Michael Schroeder <mls@suse.de>
Date: Wed, 5 Jun 2013 10:33:06 +0000 (+0200)
Subject: solver_splitprovides: only check lazywhatprovides when the pool->whatprovides entry... 
X-Git-Tag: upstream/0.4.0~107
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=519fb70bdddc94563954f3331cd1a23b76c09b56;p=platform%2Fupstream%2Flibsolv.git

solver_splitprovides: only check lazywhatprovides when the pool->whatprovides entry is zero

Otherwise splitprovides don't work when standard file locations are used.
---

diff --git a/src/solver.c b/src/solver.c
index 052c834..12c91e0 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -65,7 +65,7 @@ solver_splitprovides(Solver *solv, Id dep)
    * for installed packages and check the lazywhatprovidesq (ignoring the REL_WITH part, but
    * we filter the package name further down anyway).
    */
-  if (pool->addedfileprovides == 1 && !ISRELDEP(rd->evr))
+  if (pool->addedfileprovides == 1 && !ISRELDEP(rd->evr) && !pool->whatprovides[rd->evr])
     pp = pool_searchlazywhatprovidesq(pool, rd->evr);
   else
     pp = pool_whatprovides(pool, dep);