testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

fix

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=566
This commit is contained in:
Michael Schröder 2021-01-07 10:24:11 +00:00 committed by Git OBS Bridge
parent 866e482bc6
commit 500bef89db
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ndbglue.diff
View File

@ -1,6 +1,12 @@
--- ./lib/backend/ndb/glue.c.orig 2021-01-05 15:36:03.097744355 +0000 --- ./lib/backend/ndb/glue.c.orig 2021-01-05 15:36:03.097744355 +0000
+++ ./lib/backend/ndb/glue.c 2021-01-05 15:36:35.353659287 +0000 +++ ./lib/backend/ndb/glue.c 2021-01-07 10:23:41.113114258 +0000
@@ -316,7 +316,7 @@ static rpmRC ndb_pkgdbPut(dbiIndex dbi, @@ -311,12 +311,13 @@ static void setdata(dbiCursor dbc, unsi
static rpmRC ndb_pkgdbPut(dbiIndex dbi, dbiCursor dbc, unsigned int *hdrNum, unsigned char *hdrBlob, unsigned int hdrLen)
{
+ struct ndbEnv_s *ndbenv = dbc->dbi->dbi_rpmdb->db_dbenv;
unsigned int hnum = *hdrNum;
int rc = RPMRC_OK;
if (hnum == 0) { if (hnum == 0) {
rc = rpmpkgNextPkgIdx(dbc->dbi->dbi_db, &hnum); rc = rpmpkgNextPkgIdx(dbc->dbi->dbi_db, &hnum);
@ -9,7 +15,7 @@
setdata(dbc, hnum, 0, 0); setdata(dbc, hnum, 0, 0);
} }
@@ -325,7 +325,8 @@ static rpmRC ndb_pkgdbPut(dbiIndex dbi, @@ -325,7 +326,8 @@ static rpmRC ndb_pkgdbPut(dbiIndex dbi,
if (!rc) { if (!rc) {
dbc->hdrNum = hnum; dbc->hdrNum = hnum;
@ -19,9 +25,11 @@
*hdrNum = hnum; *hdrNum = hnum;
} }
return rc; return rc;
@@ -334,7 +335,8 @@ static rpmRC ndb_pkgdbPut(dbiIndex dbi, @@ -333,8 +335,10 @@ static rpmRC ndb_pkgdbPut(dbiIndex dbi,
static rpmRC ndb_pkgdbDel(dbiIndex dbi, dbiCursor dbc, unsigned int hdrNum) static rpmRC ndb_pkgdbDel(dbiIndex dbi, dbiCursor dbc, unsigned int hdrNum)
{ {
+ struct ndbEnv_s *ndbenv = dbc->dbi->dbi_rpmdb->db_dbenv;
dbc->hdrNum = 0; dbc->hdrNum = 0;
- setdata(dbc, 0, 0, 0); - setdata(dbc, 0, 0, 0);
+ if (ndbenv->hdrNum == hnum) + if (ndbenv->hdrNum == hnum)