aboutsummaryrefslogtreecommitdiff
path: root/Remote/Bup.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-08-03 15:35:23 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-08-03 15:40:01 -0400
commitb87dfe5ddfb3686ab0088c09e6e70bd7275a1f16 (patch)
tree67218881a26ab597dada971414376201610bb1a8 /Remote/Bup.hs
parent38880b605f2bb22a9e1547e3407676b4bd89935c (diff)
roll ChunkedEncryptable into Special and improve interface
Allow disabling progress displays, for eg, rsync.
Diffstat (limited to 'Remote/Bup.hs')
-rw-r--r--Remote/Bup.hs7
1 files changed, 5 insertions, 2 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index 44ea8c7d8..6a04ad5f7 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -25,7 +25,6 @@ import Config
import Config.Cost
import qualified Remote.Helper.Ssh as Ssh
import Remote.Helper.Special
-import Remote.Helper.ChunkedEncryptable
import Remote.Helper.Messages
import Utility.Hash
import Utility.UserInfo
@@ -74,12 +73,16 @@ gen r u c gc = do
, availability = if bupLocal buprepo then LocallyAvailable else GloballyAvailable
, readonly = False
}
- return $ Just $ encryptableRemote c
+ return $ Just $ specialRemote' specialcfg c
(simplyPrepare $ store this buprepo)
(simplyPrepare $ retrieve buprepo)
this
where
buprepo = fromMaybe (error "missing buprepo") $ remoteAnnexBupRepo gc
+ specialcfg = (specialRemoteCfg c)
+ -- chunking would not improve bup
+ { chunkConfig = NoChunks
+ }
bupSetup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID)
bupSetup mu _ c = do