mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

make keeplocked client UUID optional

Browse source 
It's not used, but it makes the protocol simpler if this parameter can
always be sent.
This commit is contained in:
Joey Hess 2024-07-22 19:48:54 -04:00
parent 7f4cff7ae9
commit 163a7e91c4
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
P2P/Http.hs
View file

@ -872,7 +872,7 @@ clientLockContent clientenv (ProtocolVersion ver) k su cu bypass auth =
type KeepLockedAPI type KeepLockedAPI
= LockIDParam = LockIDParam
:> CU Required :> CU Optional
:> BypassUUIDs :> BypassUUIDs
:> IsSecure :> IsSecure
:> AuthHeader :> AuthHeader
@ -887,7 +887,7 @@ serveKeepLocked
-> B64UUID ServerSide -> B64UUID ServerSide
-> v -> v
-> LockID -> LockID
-> B64UUID ClientSide -> Maybe (B64UUID ClientSide)
-> [B64UUID Bypass] -> [B64UUID Bypass]
-> IsSecure -> IsSecure
-> Maybe Auth -> Maybe Auth
@ -923,7 +923,7 @@ clientKeepLocked
clientKeepLocked clientenv (ProtocolVersion ver) lckid su cu bypass auth a = do clientKeepLocked clientenv (ProtocolVersion ver) lckid su cu bypass auth a = do
keeplocked <- newEmptyTMVarIO keeplocked <- newEmptyTMVarIO
tid <- async $ a keeplocked tid <- async $ a keeplocked
let cli' = cli lckid cu bypass auth let cli' = cli lckid (Just cu) bypass auth
(Just connectionKeepAlive) (Just keepAlive) (Just connectionKeepAlive) (Just keepAlive)
(S.fromStepT (unlocksender keeplocked)) (S.fromStepT (unlocksender keeplocked))
withClientM cli' clientenv $ \case withClientM cli' clientenv $ \case