Merge branch 'master' into pidlockfinegrained

2021-12-06 13:00:40 -04:00 · 2021-12-06 13:00:40 -04:00 · 774c7dab2f
commit 774c7dab2f
parent e5ca67ea1c 7c78fae463
9 changed files with 66 additions and 11 deletions
--- a/Utility/LockFile/PidLock.hs
+++ b/Utility/LockFile/PidLock.hs
@ -280,7 +280,7 @@ waitedLock (Seconds timeout) lockfile displaymessage = do
 	giveup $ "Gave up waiting for pid lock file " ++ fromRawFilePath lockfile

 -- | Use when the pid lock has already been taken by another thread of the
-- same process, or perhaps is in the process of being taken.
+-- same process.
 alreadyLocked :: MonadIO m => PidLockFile -> m LockHandle
 alreadyLocked lockfile = liftIO $ do
 	abslockfile <- absPath lockfile