加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
backport-resolve-installed-remove-dead-code.patch 1.44 KB
一键复制 编辑 原始数据 按行查看 历史
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.
---
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)
{
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化