Cleanup last commit a bit

diff --git a/src/policy.c b/src/policy.c
index 185561ed33fda563c678ca38d81b1557752b0f23..468be67ca3115a75c5b645fb8d68c2516c499d5f 100644 (file)
--- a/src/policy.c
+++ b/src/policy.c
@@ -202,16 +202,14 @@ solver_prune_to_highest_prio_per_name(Solver *solv, Queue *plist)
     {
       if (pool->solvables[plist->elements[i]].name != name)
        {
+         name = pool->solvables[plist->elements[i]].name;
          if (pq.count > 2)
            solver_prune_to_highest_prio(solv, &pq);
          for (k = 0; k < pq.count; k++)
            plist->elements[j++] = pq.elements[k];
          queue_empty(&pq);
-         queue_push(&pq, plist->elements[i]);
-         name = pool->solvables[pq.elements[0]].name;
        }
-      else
-         queue_push(&pq, plist->elements[i]);
+      queue_push(&pq, plist->elements[i]);
     }
   if (pq.count > 2)
     solver_prune_to_highest_prio(solv, &pq);

diff --git a/test/testcases/recommendations/recommended_conflicts.t b/test/testcases/recommendations/recommended_conflicts.t
index 2e28871da915c7c8cb84f00a3a04ab587779921a..92afd759636b74c597cbaa913a4548d2891c13c8 100644 (file)
--- a/test/testcases/recommendations/recommended_conflicts.t
+++ b/test/testcases/recommendations/recommended_conflicts.t
@@ -13,4 +13,4 @@ job install name A
 
 result transaction,recommended,problems <inline>
 #>install A-1-1.noarch@available
-#>recommended B-2-1.noarch@available
\ No newline at end of file
+#>recommended B-2-1.noarch@available

diff --git a/test/testcases/recommendations/recommended_multirepo.t b/test/testcases/recommendations/recommended_multirepo.t
index 9fc60d0198f1cf424ac1a4496ea176f08c694501..0addaf4a765d12037e016c2c530647d3970f73a6 100644 (file)
--- a/test/testcases/recommendations/recommended_multirepo.t
+++ b/test/testcases/recommendations/recommended_multirepo.t
@@ -16,4 +16,4 @@ job install name A
 
 result transaction,recommended,problems <inline>
 #>install A-1-1.noarch@available
-#>recommended B-6-1.noarch@other
\ No newline at end of file
+#>recommended B-6-1.noarch@other

diff --git a/test/testcases/recommendations/recommended_oldversion.t b/test/testcases/recommendations/recommended_oldversion.t
index f7a1a62dc276425a8151c295d465b2b6884cb78d..27c62f19a23fe367cf83f120b443aeb66b068933 100644 (file)
--- a/test/testcases/recommendations/recommended_oldversion.t
+++ b/test/testcases/recommendations/recommended_oldversion.t
@@ -12,4 +12,4 @@ job install name A
 
 result transaction,recommended,problems <inline>
 #>install A-1-1.noarch@available
-#>recommended B-2-1.noarch@available
\ No newline at end of file
+#>recommended B-2-1.noarch@available

diff --git a/test/testcases/recommendations/recommended_targeted.t b/test/testcases/recommendations/recommended_targeted.t
index d5a0b1595e1e1500610f3e6eefd3ff7ca2850944..2b8a8423b883eaf08e089ef3622fa4c28bfbcc05 100644 (file)
--- a/test/testcases/recommendations/recommended_targeted.t
+++ b/test/testcases/recommendations/recommended_targeted.t
@@ -12,4 +12,4 @@ job install name A
 
 result transaction,recommended,problems <inline>
 #>install A-1-1.noarch@available
-#>recommended B-2-1.noarch@available
\ No newline at end of file
+#>recommended B-2-1.noarch@available

diff --git a/test/testcases/recommendations/recommended_version.t b/test/testcases/recommendations/recommended_version.t
index 3a875139588850eda4dca7797e29568585caba64..b2e36370b48df61ac19561aba9a959f200a9b9a6 100644 (file)
--- a/test/testcases/recommendations/recommended_version.t
+++ b/test/testcases/recommendations/recommended_version.t
@@ -12,4 +12,4 @@ job install name A
 
 result transaction,recommended,problems <inline>
 #>install A-1-1.noarch@available
-#>recommended B-3-1.noarch@available
\ No newline at end of file
+#>recommended B-3-1.noarch@available

diff --git a/test/testcases/recommendations/suggested_conflicts.t b/test/testcases/recommendations/suggested_conflicts.t
index fa83413f536a7f0b61182c260a5ff6d401381fab..8de6f3de911d52db5eaad8be5e7926707c336410 100644 (file)
--- a/test/testcases/recommendations/suggested_conflicts.t
+++ b/test/testcases/recommendations/suggested_conflicts.t
@@ -13,4 +13,4 @@ job install name A
 
 result transaction,recommended,problems <inline>
 #>install A-1-1.noarch@available
-#>suggested B-2-1.noarch@available
\ No newline at end of file
+#>suggested B-2-1.noarch@available

diff --git a/test/testcases/recommendations/suggested_multirepo.t b/test/testcases/recommendations/suggested_multirepo.t
index db3ab4b27fd93c90f9994eea3255c4bde414d90d..c0a6d8f15018594a8b7d6fff1fa514efb585c5f9 100644 (file)
--- a/test/testcases/recommendations/suggested_multirepo.t
+++ b/test/testcases/recommendations/suggested_multirepo.t
@@ -16,4 +16,4 @@ job install name A
 
 result transaction,recommended,problems <inline>
 #>install A-1-1.noarch@available
-#>suggested B-6-1.noarch@other
\ No newline at end of file
+#>suggested B-6-1.noarch@other

diff --git a/test/testcases/recommendations/suggested_oldversion.t b/test/testcases/recommendations/suggested_oldversion.t
index ad08be1cc69b46fc713a6e9aa3e39af9d595ce3c..b259b6580d5829b117d6eb94054e2157ad13933d 100644 (file)
--- a/test/testcases/recommendations/suggested_oldversion.t
+++ b/test/testcases/recommendations/suggested_oldversion.t
@@ -12,4 +12,4 @@ job install name A
 
 result transaction,recommended,problems <inline>
 #>install A-1-1.noarch@available
-#>suggested B-2-1.noarch@available
\ No newline at end of file
+#>suggested B-2-1.noarch@available

diff --git a/test/testcases/recommendations/suggested_targeted.t b/test/testcases/recommendations/suggested_targeted.t
index 5a9f1aa2bb1fd61799465ca4be4b0e62ac7ab197..01da811c2113dd47ceb672a029505a1194396a3f 100644 (file)
--- a/test/testcases/recommendations/suggested_targeted.t
+++ b/test/testcases/recommendations/suggested_targeted.t
@@ -12,4 +12,4 @@ job install name A
 
 result transaction,recommended,problems <inline>
 #>install A-1-1.noarch@available
-#>suggested B-2-1.noarch@available
\ No newline at end of file
+#>suggested B-2-1.noarch@available

diff --git a/test/testcases/recommendations/suggested_version.t b/test/testcases/recommendations/suggested_version.t
index 27a3b53895c632dab94cdfa656ca488a52674145..1af6a77cb4ef0dadd194cb6295c49309d1c8961a 100644 (file)
--- a/test/testcases/recommendations/suggested_version.t
+++ b/test/testcases/recommendations/suggested_version.t
@@ -12,4 +12,4 @@ job install name A
 
 result transaction,recommended,problems <inline>
 #>install A-1-1.noarch@available
-#>suggested B-3-1.noarch@available
\ No newline at end of file
+#>suggested B-3-1.noarch@available