33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
From 553c69b514c1ca85a6311373b48c6096886dcff3 Mon Sep 17 00:00:00 2001
|
|
From: Michael Schroeder <mls@suse.de>
|
|
Date: Tue, 13 Feb 2024 12:43:50 +0100
|
|
Subject: [PATCH] resolve_installed: remove dead code
|
|
|
|
Since we simplified our dup handling the update rules always
|
|
start with the installed package.
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/openSUSE/libsolv/commit/553c69b514c1ca85a6311373b48c6096886dcff3
|
|
---
|
|
src/solver.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/solver.c b/src/solver.c
|
|
index 363d88734..0c3333d87 100644
|
|
--- a/src/solver.c
|
|
+++ b/src/solver.c
|
|
@@ -1835,11 +1835,10 @@ resolve_installed(Solver *solv, int level, int disablerules, Queue *dq)
|
|
|
|
/* check if we should update this package to the latest version
|
|
* noupdate is set for erase jobs, in that case we want to deinstall
|
|
- * the installed package and not replace it with a newer version
|
|
- * rr->p != i is for dup jobs where the installed package cannot be kept */
|
|
+ * the installed package and not replace it with a newer version */
|
|
if (dq->count)
|
|
queue_empty(dq);
|
|
- if (!MAPTST(&solv->noupdate, i - installed->start) && (solv->decisionmap[i] < 0 || solv->updatemap_all || (solv->updatemap.size && MAPTST(&solv->updatemap, i - installed->start)) || (rr->p && rr->p != i)))
|
|
+ if (!MAPTST(&solv->noupdate, i - installed->start) && (solv->decisionmap[i] < 0 || solv->updatemap_all || (solv->updatemap.size && MAPTST(&solv->updatemap, i - installed->start))))
|
|
{
|
|
if (specialupdaters && (d = specialupdaters[i - installed->start]) != 0)
|
|
{
|