Michael Schröder
9c5d0ddfdb
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=420
33 lines
907 B
Diff
33 lines
907 B
Diff
--- ./lib/rpmdb.c.orig 2017-10-05 10:05:27.459594162 +0000
|
|
+++ ./lib/rpmdb.c 2017-12-01 14:19:12.361872712 +0000
|
|
@@ -387,9 +387,11 @@ int rpmdbClose(rpmdb db)
|
|
{
|
|
rpmdb * prev, next;
|
|
int rc = 0;
|
|
+ int dbmode;
|
|
|
|
if (db == NULL)
|
|
goto exit;
|
|
+ dbmode = db->db_mode;
|
|
|
|
prev = &rpmdbRock;
|
|
while ((next = *prev) != NULL && next != db)
|
|
@@ -424,7 +426,7 @@ int rpmdbClose(rpmdb db)
|
|
|
|
db = _free(db);
|
|
|
|
- if (rpmdbRock == NULL) {
|
|
+ if (rpmdbRock == NULL && (dbmode & (O_RDWR|O_WRONLY)) != 0) {
|
|
rpmsqActivate(0);
|
|
}
|
|
exit:
|
|
@@ -505,7 +507,7 @@ static int openDatabase(const char * pre
|
|
/* Try to ensure db home exists, error out if we can't even create */
|
|
rc = rpmioMkpath(rpmdbHome(db), 0755, getuid(), getgid());
|
|
if (rc == 0) {
|
|
- if (rpmdbRock == NULL) {
|
|
+ if (rpmdbRock == NULL && (db->db_mode & (O_RDWR|O_WRONLY)) != 0) {
|
|
rpmsqActivate(1);
|
|
}
|
|
|