From: Michael Schroeder Date: Thu, 7 Sep 2017 12:40:46 +0000 (+0200) Subject: Cleanup last commit a bit X-Git-Tag: 0.6.29~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50d96fa65bb9aa60a93b99a56b8bf0287e78759d;p=thirdparty%2Flibsolv.git Cleanup last commit a bit --- diff --git a/src/policy.c b/src/policy.c index 185561ed..468be67c 100644 --- 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 2e28871d..92afd759 100644 --- 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 #>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 9fc60d01..0addaf4a 100644 --- 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 #>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 f7a1a62d..27c62f19 100644 --- 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 #>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 d5a0b159..2b8a8423 100644 --- 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 #>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 3a875139..b2e36370 100644 --- 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 #>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 fa83413f..8de6f3de 100644 --- 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 #>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 db3ab4b2..c0a6d8f1 100644 --- 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 #>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 ad08be1c..b259b658 100644 --- 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 #>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 5a9f1aa2..01da811c 100644 --- 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 #>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 27a3b538..1af6a77c 100644 --- 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 #>install A-1-1.noarch@available -#>suggested B-3-1.noarch@available \ No newline at end of file +#>suggested B-3-1.noarch@available