From 5d499682a0a739b5269247a8f6dbb874e3eec456 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Wed, 31 May 2023 14:42:46 -0500 Subject: server: Fix crash when checking lock file Fixes a crash when the server process attempts to check the PID of the lock file that resulted because an integer (os.getpid()) was attempting to be concatenated to a string Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/server/process.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py index db417c842..7616ef53c 100644 --- a/lib/bb/server/process.py +++ b/lib/bb/server/process.py @@ -375,7 +375,7 @@ class ProcessServer(): lock = bb.utils.lockfile(lockfile, shared=False, retry=False, block=False) if not lock: newlockcontents = get_lock_contents(lockfile) - if not newlockcontents[0].startswith([os.getpid() + "\n", os.getpid() + " "]): + if not newlockcontents[0].startswith([f"{os.getpid()}\n", f"{os.getpid()} "]): # A new server was started, the lockfile contents changed, we can exit serverlog("Lockfile now contains different contents, exiting: " + str(newlockcontents)) return -- cgit 1.2.3-korg