From: Michael Schroeder <mls@suse.de>
Date: Tue, 7 Jun 2016 09:01:16 +0000 (+0200)
Subject: Tweak urpm_reorder so that selected packages get score 4
X-Git-Tag: 0.6.22~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c63602c0337d3f791a241e7e09d5445a0d849896;p=thirdparty%2Flibsolv.git

Tweak urpm_reorder so that selected packages get score 4
---

diff --git a/src/policy.c b/src/policy.c
index 3a0a7376..7ed52d98 100644
--- a/src/policy.c
+++ b/src/policy.c
@@ -1231,8 +1231,15 @@ urpm_reorder(Solver *solv, Queue *plist)
 	      if (knid)
 		{
 		  FOR_PROVIDES(p, pp, knid)
-		    if (solv->decisionmap[p] > 0 || (pool->installed && pool->solvables[p].repo == pool->installed))
-		      score = 3;
+		    {
+		      if (solv->decisionmap[p] > 0)
+			{
+			  score = 4;
+			  break;
+			}
+		      else if (pool->installed && pool->solvables[p].repo == pool->installed)
+			score = 3;
+		    }
 		}
 	    }
 	}
@@ -1257,8 +1264,15 @@ urpm_reorder(Solver *solv, Queue *plist)
 		      if (knid)
 			{
 			  FOR_PROVIDES(p, pp, knid)
-			    if (solv->decisionmap[p] > 0 || (pool->installed && pool->solvables[p].repo == pool->installed))
-			      score = 3;
+			    {
+			      if (solv->decisionmap[p] > 0)
+				{
+				  score = 4;
+				  break;
+				}
+			      if (pool->installed && pool->solvables[p].repo == pool->installed)
+				score = 3;
+			    }
 			}
 		    }
 		}
@@ -1284,8 +1298,15 @@ urpm_reorder(Solver *solv, Queue *plist)
 		{
 		  score = 0;
 		  FOR_PROVIDES(p, pp, id)
-		    if (solv->decisionmap[p] > 0 || (pool->installed && pool->solvables[p].repo == pool->installed))
-		      score = 3;
+		    {
+		      if (solv->decisionmap[p] > 0)
+			{
+			  score = 4;
+			  break;
+			}
+		      if (pool->installed && pool->solvables[p].repo == pool->installed)
+			score = 3;
+		    }
 		  break;
 		}
 	    }