diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-03 15:35:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-03 15:40:01 -0400 |
| commit | b87dfe5ddfb3686ab0088c09e6e70bd7275a1f16 (patch) | |
| tree | 67218881a26ab597dada971414376201610bb1a8 /Remote/WebDAV.hs | |
| parent | 38880b605f2bb22a9e1547e3407676b4bd89935c (diff) | |
roll ChunkedEncryptable into Special and improve interface
Allow disabling progress displays, for eg, rsync.
Diffstat (limited to 'Remote/WebDAV.hs')
| -rw-r--r-- | Remote/WebDAV.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index d6644cdc7..0bdd38360 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -28,7 +28,6 @@ import Config import Config.Cost import Remote.Helper.Special import Remote.Helper.Encryptable -import Remote.Helper.Chunked import qualified Remote.Helper.Chunked.Legacy as Legacy import Crypto import Creds @@ -122,7 +121,7 @@ storeHelper r k baseurl user pass b = catchBoolIO $ do where tmpurl = tmpLocation baseurl k keyurl = davLocation baseurl k - chunkconfig = chunkConfig $ config r + chunkconfig = getChunkConfig $ config r finalizer srcurl desturl = do void $ tryNonAsync (deleteDAV desturl user pass) mkdirRecursiveDAV (urlParent desturl) user pass @@ -220,7 +219,7 @@ withStoredFiles r k baseurl user pass onerr a = case chunkconfig of else a chunks where keyurl = davLocation baseurl k ++ keyFile k - chunkconfig = chunkConfig $ config r + chunkconfig = getChunkConfig $ config r davAction :: Remote -> a -> ((DavUrl, DavUser, DavPass) -> Annex a) -> Annex a davAction r unconfigured action = do |