diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-09-13 15:03:37 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-09-13 15:09:19 -0400 |
| commit | d5563ace55321012e291d1f5ae86e3d34ef52901 (patch) | |
| tree | 7542a62a84f1ba8ec2833670826733eb443592e7 /Remote | |
| parent | a72dfd263a4f8a682c6d29442860d3c99a848389 (diff) | |
fix exporting files in subdirectories to webdav
Use tmp/key when exporting, so the whole export directory structure does
not have to be created under tmp/
This commit was sponsored by Denis Dzyubenko on Patreon.
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/WebDAV.hs | 4 | ||||
| -rw-r--r-- | Remote/WebDAV/DavLocation.hs | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index c45776a69..5e853ae22 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -179,9 +179,9 @@ checkKey r chunkconfig (Just dav) k = do either giveup return v storeExportDav :: Maybe DavHandle -> FilePath -> Key -> ExportLocation -> MeterUpdate -> Annex Bool -storeExportDav mh f _k loc p = runExport mh $ \dav -> do +storeExportDav mh f k loc p = runExport mh $ \dav -> do reqbody <- liftIO $ httpBodyStorer f p - storeHelper dav (exportTmpLocation loc) (exportLocation loc) reqbody + storeHelper dav (keyTmpLocation k) (exportLocation loc) reqbody return True retrieveExportDav :: Maybe DavHandle -> Key -> ExportLocation -> FilePath -> MeterUpdate -> Annex Bool diff --git a/Remote/WebDAV/DavLocation.hs b/Remote/WebDAV/DavLocation.hs index 81777e887..8979ab9ef 100644 --- a/Remote/WebDAV/DavLocation.hs +++ b/Remote/WebDAV/DavLocation.hs @@ -53,9 +53,6 @@ keyTmpLocation = tmpLocation . keyFile exportLocation :: ExportLocation -> DavLocation exportLocation (ExportLocation f) = f -exportTmpLocation :: ExportLocation -> DavLocation -exportTmpLocation (ExportLocation f) = tmpLocation f - tmpLocation :: FilePath -> DavLocation tmpLocation f = tmpDir </> f |