webdav: Changed path used on webdav server for temporary files.

Done to avoid a "tmp" directory appearing in webdav exports.

Also affects non-export webdav remotes, so interrupted uploads using the
old path will not overwrite it. However, PUT is quite likely to be
implemented atomically on web servers anyway, so I doubt this will cause
problems.
This commit is contained in:
Joey Hess 2017-09-15 15:52:31 -04:00
parent 1223960294
commit cf51f40f0e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 8 additions and 10 deletions

View file

@ -127,7 +127,7 @@ store _ (Just dav) = httpStorer $ \k reqbody -> liftIO $ goDAV dav $ do
storeHelper :: DavHandle -> DavLocation -> DavLocation -> RequestBody -> DAVT IO ()
storeHelper dav tmp dest reqbody = do
void $ mkColRecursive tmpDir
maybe noop (void . mkColRecursive) (locationParent tmp)
inLocation tmp $
putContentM' (contentType, reqbody)
finalizeStore dav tmp dest
@ -257,8 +257,8 @@ testDav url (Just (u, p)) = do
test $ liftIO $ evalDAVT url $ do
prepDAV user pass
makeParentDirs
void $ mkColRecursive tmpDir
inLocation (tmpLocation "git-annex-test") $ do
void $ mkColRecursive "/"
inLocation (tmpLocation "test") $ do
putContentM (Nothing, L8.fromString "test")
delContentM
where