Michael Schröder
d3791d0083
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=295
68 lines
2.3 KiB
Diff
68 lines
2.3 KiB
Diff
From fae0eef24582dd9e071be8e884ff0851d4b57437 Mon Sep 17 00:00:00 2001
|
|
From: Michael Schroeder <mls@suse.de>
|
|
Date: Fri, 27 Sep 2013 15:09:20 +0200
|
|
Subject: [PATCH] Ignore self-obsoletes and self-conflicts in dependency check
|
|
code
|
|
|
|
We already ignored them when checking against the added package list,
|
|
but not when checking against installed packages. Thus, rpm -V reported
|
|
them as errors.
|
|
---
|
|
lib/depends.c | 26 ++++++++++++++++++++++++--
|
|
1 file changed, 24 insertions(+), 2 deletions(-)
|
|
|
|
diff --git lib/depends.c lib/depends.c
|
|
index 3d70e68..3ef27bc 100644
|
|
--- lib/depends.c
|
|
+++ lib/depends.c
|
|
@@ -504,6 +504,12 @@ static int rpmdbProvides(rpmts ts, depCache dcache, rpmds dep)
|
|
if (deptag != RPMTAG_OBSOLETENAME && Name[0] == '/') {
|
|
mi = rpmtsPrunedIterator(ts, RPMDBI_INSTFILENAMES, Name, prune);
|
|
while ((h = rpmdbNextIterator(mi)) != NULL) {
|
|
+ /* Ignore self-conflicts */
|
|
+ if (deptag == RPMTAG_CONFLICTNAME) {
|
|
+ unsigned int instance = headerGetInstance(h);
|
|
+ if (instance && instance == rpmdsInstance(dep))
|
|
+ continue;
|
|
+ }
|
|
rpmdsNotify(dep, "(db files)", rc);
|
|
break;
|
|
}
|
|
@@ -527,6 +533,12 @@ static int rpmdbProvides(rpmts ts, depCache dcache, rpmds dep)
|
|
int prix = (selfevr) ? -1 : rpmdbGetIteratorFileNum(mi);
|
|
int match = rpmdsMatches(tspool, h, prix, dep, selfevr,
|
|
_rpmds_nopromote);
|
|
+ /* Ignore self-obsoletes and self-conflicts */
|
|
+ if (match && (deptag == RPMTAG_OBSOLETENAME || deptag == RPMTAG_CONFLICTNAME)) {
|
|
+ unsigned int instance = headerGetInstance(h);
|
|
+ if (instance && instance == rpmdsInstance(dep))
|
|
+ match = 0;
|
|
+ }
|
|
if (match) {
|
|
rpmdsNotify(dep, "(db provides)", rc);
|
|
break;
|
|
@@ -672,8 +684,18 @@ static void checkInstDeps(rpmts ts, depCache dcache, rpmte te,
|
|
rpmstrPool pool = rpmtsPool(ts);
|
|
|
|
while ((h = rpmdbNextIterator(mi)) != NULL) {
|
|
- char * pkgNEVRA = headerGetAsString(h, RPMTAG_NEVRA);
|
|
- rpmds ds = rpmdsNewPool(pool, h, depTag, 0);
|
|
+ char * pkgNEVRA;
|
|
+ rpmds ds;
|
|
+
|
|
+ /* Ignore self-obsoletes and self-conflicts */
|
|
+ if (depTag == RPMTAG_OBSOLETENAME || depTag == RPMTAG_CONFLICTNAME) {
|
|
+ unsigned int instance = headerGetInstance(h);
|
|
+ if (instance && instance == rpmteDBInstance(te))
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ pkgNEVRA = headerGetAsString(h, RPMTAG_NEVRA);
|
|
+ ds = rpmdsNewPool(pool, h, depTag, 0);
|
|
|
|
checkDS(ts, dcache, te, pkgNEVRA, ds, dep, 0);
|
|
|
|
--
|
|
1.8.1.4
|
|
|