Merge pull request #411 from oliverkurth/stable-3.3

fixes for 3.3.8

CMakeLists.txt

@@ -8,7 +8,7 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 3.0 FATAL_ERROR)
 
-project(tdnf VERSION 3.3.7 LANGUAGES C)
+project(tdnf VERSION 3.3.8 LANGUAGES C)
 set(VERSION ${PROJECT_VERSION})
 set(PROJECT_YEAR 2023)
 

client/defines.h

@@ -22,12 +22,6 @@
 
 #include "config.h"
 
-/*
- * creating this under /var/run because /var/run/lock doesn't exist
- * in fedora docker images and as a result ci fails
- */
-#define TDNF_INSTANCE_LOCK_FILE     "/var/run/.tdnf-instance-lockfile"
-
 typedef enum
 {
     /* this should be a bitmask */

client/repolist.c

@@ -411,7 +411,7 @@ TDNFLoadReposFromFile(
         dwError = TDNFReadKeyValue(
                       pSections,
                       TDNF_REPO_KEY_NAME,
-                      NULL,
+                      pszRepo,
                       &pRepo->pszName);
         BAIL_ON_TDNF_ERROR(dwError);
 

common/defines.h

@@ -33,3 +33,9 @@
     } while(0)
 
 #define TDNF_DEFAULT_MAX_STRING_LEN       16384000
+
+/*
+ * creating this under /var/run because /var/run/lock doesn't exist
+ * in fedora docker images and as a result ci fails
+ */
+#define TDNF_INSTANCE_LOCK_FILE     "/var/run/.tdnf-instance-lockfile"

common/lock.c

@@ -54,6 +54,21 @@ static tdnflock tdnflock_new(const char *lock_path, const char *descr)
 	else
 	{
 		lock->openmode = TDNFLOCK_WRITE | TDNFLOCK_READ;
+
+		/* Write out PID into lock file */
+		char pid_buffer[128] = {0};
+		int rsnpf;
+		rsnpf = snprintf(pid_buffer, sizeof(pid_buffer), "%ld\n", (long) getpid());
+
+		if (rsnpf > 0)
+		{
+			int wr;
+			wr = write(lock->fd, pid_buffer, strlen(pid_buffer));
+			if (wr == 0)
+			{
+				sync();
+			}
+		}
 	}
 
 	lock->fdrefs = 1;
@@ -236,5 +251,11 @@ tdnflock tdnflockFree(tdnflock lock)
 		tdnflock_free(lock);
 	}
 
+	if (remove(TDNF_INSTANCE_LOCK_FILE))
+	{
+			pr_err("WARNING: Unable to remove lockfile(%s)\n",
+							TDNF_INSTANCE_LOCK_FILE);
+	}
+
 	return NULL;
 }