diff options
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 |