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

avoid setPresent when sending to a peer

Browse source 
This mirrors how git-annex-shell works; recvKey updates location
tracking, but sendKey does not.
This commit is contained in:
Joey Hess 2016-11-17 20:54:14 -04:00
parent 65e903397c
commit ae403be24b
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Remote/Helper/P2P.hs
View file

@ -160,10 +160,6 @@ serve myuuid = go Nothing
go autheduuid go autheduuid
authed theiruuid r = case r of authed theiruuid r = case r of
GET offset key -> do
ok <- sendContent key offset
when ok $
setPresent key theiruuid
PUT key -> do PUT key -> do
(Len n) <- keyFileSize key (Len n) <- keyFileSize key
let offset = Offset n let offset = Offset n
@ -174,6 +170,9 @@ serve myuuid = go Nothing
void $ receiveContent key offset len void $ receiveContent key offset len
setPresent key myuuid setPresent key myuuid
_ -> sendMessage (PROTO_ERROR "expected DATA") _ -> sendMessage (PROTO_ERROR "expected DATA")
-- setPresent not called because the peer may have
-- requested the data but not permanatly stored it.
GET offset key -> sendContent key offset
_ -> sendMessage (PROTO_ERROR "unexpected command") _ -> sendMessage (PROTO_ERROR "unexpected command")
sendContent :: Key -> Offset -> Proto Bool sendContent :: Key -> Offset -> Proto Bool