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/Ddar.hs | |
| parent | 38880b605f2bb22a9e1547e3407676b4bd89935c (diff) | |
roll ChunkedEncryptable into Special and improve interface
Allow disabling progress displays, for eg, rsync.
Diffstat (limited to 'Remote/Ddar.hs')
| -rw-r--r-- | Remote/Ddar.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Remote/Ddar.hs b/Remote/Ddar.hs index bc4755a81..b4c7ac1e6 100644 --- a/Remote/Ddar.hs +++ b/Remote/Ddar.hs @@ -22,7 +22,6 @@ import qualified Git import Config import Config.Cost import Remote.Helper.Special -import Remote.Helper.ChunkedEncryptable import Annex.Ssh import Annex.UUID @@ -42,7 +41,7 @@ gen r u c gc = do if ddarLocal ddarrepo then nearlyCheapRemoteCost else expensiveRemoteCost - return $ Just $ encryptableRemote c + return $ Just $ specialRemote' specialcfg c (simplyPrepare $ store ddarrepo) (simplyPrepare $ retrieve ddarrepo) (this cst) @@ -71,6 +70,10 @@ gen r u c gc = do , readonly = False } ddarrepo = fromMaybe (error "missing ddarrepo") $ remoteAnnexDdarRepo gc + specialcfg = (specialRemoteCfg c) + -- chunking would not improve ddar + { chunkConfig = NoChunks + } ddarSetup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID) ddarSetup mu _ c = do |