Create transaction lock file after rebuilddb

Since 79b26f1 reading the keys is also
protected by a transaction lock.

A missing lock file will trip up users without write permissing to the
rpmdb directory. RPM will try to create the file but fails.

Normally the lock file is created during system installation. So
rebuilding the rpmdb must also create the file to keep the rpmdb
fully functional.

Move the creation and freeing of the lock and it's path into separate
functions.

Related: rpm-software-management#3886

Author: ffesti

lib/rpmts.cc

@@ -129,6 +129,8 @@ int rpmtsSetDBMode(rpmts ts, int dbmode)
     return rc;
 }
 
+static
+void rpmtsLockFree(rpmts ts);
 
 int rpmtsRebuildDB(rpmts ts)
 {
@@ -151,6 +153,12 @@ int rpmtsRebuildDB(rpmts ts)
 	    rc = rpmdbRebuild(ts->rootDir, NULL, NULL, rebuildflags);
 	rpmtxnEnd(txn);
     }
+    /* Re-create lock file */
+    rpmtsLockFree(ts);
+    txn = rpmtxnBegin(ts, RPMTXN_WRITE);
+    if (txn)
+	rpmtxnEnd(txn);
+
     return rc;
 }
 
@@ -584,8 +592,7 @@ rpmts rpmtsFree(rpmts ts)
 	ts->scriptFd = NULL;
     }
     ts->rootDir = _free(ts->rootDir);
-    ts->lockPath = _free(ts->lockPath);
-    ts->lock = rpmlockFree(ts->lock);
+    rpmtsLockFree(ts);
 
     ts->keyring = rpmKeyringFree(ts->keyring);
     ts->netsharedPaths = argvFree(ts->netsharedPaths);
@@ -1063,15 +1070,11 @@ rpmte rpmtsiNext(rpmtsi tsi, rpmElementTypes types)
 }
 
 #define RPMLOCK_PATH LOCALSTATEDIR "/rpm/.rpm.lock"
-rpmtxn rpmtxnBegin(rpmts ts, rpmtxnFlags flags)
+static
+void rpmtsLockInit(rpmts ts)
 {
     static const char * const rpmlock_path_default = "%{?_rpmlock_path}";
-    rpmtxn txn = NULL;
-
-    if (ts == NULL)
-	return NULL;
-
-    if (ts->lockPath == NULL) {
+    if (ts && ts->lockPath == NULL) {
 	const char *rootDir = rpmtsRootDir(ts);
 	char *t;
 
@@ -1087,6 +1090,25 @@ rpmtxn rpmtxnBegin(rpmts ts, rpmtxnFlags flags)
 	(void) rpmioMkpath(dirname(t), 0755, getuid(), getgid());
 	free(t);
     }
+}
+
+static
+void rpmtsLockFree(rpmts ts)
+{
+    if (ts) {
+	ts->lockPath = _free(ts->lockPath);
+	ts->lock = rpmlockFree(ts->lock);
+    }
+}
+
+rpmtxn rpmtxnBegin(rpmts ts, rpmtxnFlags flags)
+{
+    rpmtxn txn = NULL;
+
+    if (ts == NULL)
+	return NULL;
+
+    rpmtsLockInit(ts);
 
     if (ts->lock == NULL)
 	ts->lock = rpmlockNew(ts->lockPath, _("transaction"));

tests/rpmdb.at

@@ -567,12 +567,16 @@ runroot rpm -U --noscripts --nodeps --ignorearch --nosignature \
   /data/RPMS/hello-2.0-1.i686.rpm
 runroot rpm -qa --qf "%{nevra} %{dbinstance}\n"
 runroot rpmdb --rebuilddb
+runroot ls `rpm -E "%{_dbpath}/.rpm.lock"`
 runroot rpm -qa --qf "%{nevra} %{dbinstance}\n"
+runroot ls `rpm -E "%{_dbpath}/.rpm.lock"`
 ],
 [],
 [hello-1.0-1.i386 1
 hello-2.0-1.i686 2
+/var/lib/rpm-testsuite/.rpm.lock
 hello-2.0-1.i686 1
+/var/lib/rpm-testsuite/.rpm.lock
 ],
 [])
 RPMTEST_CLEANUP
@@ -584,10 +588,14 @@ AT_KEYWORDS([rpmdb])
 RPMTEST_CHECK([
 RPMDB_RESET
 runroot rpmdb --rebuilddb
+runroot ls `rpm -E "%{_dbpath}/.rpm.lock"`
 runroot rpmdb --verifydb
+runroot ls `rpm -E "%{_dbpath}/.rpm.lock"`
 ],
 [0],
-[],
+[/var/lib/rpm-testsuite/.rpm.lock
+/var/lib/rpm-testsuite/.rpm.lock
+],
 [])
 RPMTEST_CLEANUP