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/Glacier.hs | |
| parent | 38880b605f2bb22a9e1547e3407676b4bd89935c (diff) | |
roll ChunkedEncryptable into Special and improve interface
Allow disabling progress displays, for eg, rsync.
Diffstat (limited to 'Remote/Glacier.hs')
| -rw-r--r-- | Remote/Glacier.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs index 592a7db1f..c5bfefa64 100644 --- a/Remote/Glacier.hs +++ b/Remote/Glacier.hs @@ -18,7 +18,6 @@ import qualified Git import Config import Config.Cost import Remote.Helper.Special -import Remote.Helper.ChunkedEncryptable import qualified Remote.Helper.AWS as AWS import Creds import Utility.Metered @@ -40,7 +39,7 @@ remote = RemoteType { gen :: Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> Annex (Maybe Remote) gen r u c gc = new <$> remoteCost gc veryExpensiveRemoteCost where - new cst = Just $ encryptableRemote c + new cst = Just $ specialRemote' specialcfg c (prepareStore this) (prepareRetrieve this) this @@ -66,6 +65,10 @@ gen r u c gc = new <$> remoteCost gc veryExpensiveRemoteCost availability = GloballyAvailable, remotetype = remote } + specialcfg = (specialRemoteCfg c) + -- Disabled until jobList gets support for chunks. + { chunkConfig = NoChunks + } glacierSetup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID) glacierSetup mu mcreds c = do |