diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-05 00:09:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-05 00:09:11 -0400 |
| commit | 94718242872b9c17ccc1e4888328b124cb02dcac (patch) | |
| tree | b46d29358889081d3d28f3c8a6190b97371cb030 /Remote/Directory.hs | |
| parent | 48e7a83f8613690432f100886760135cfa3b5b0f (diff) | |
| parent | 2f3b108d49c534e828cec8adceef7defc942b67f (diff) | |
Merge branch 'encryption'
Diffstat (limited to 'Remote/Directory.hs')
| -rw-r--r-- | Remote/Directory.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 6cc75d2f1..0b3ce443b 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -41,7 +41,7 @@ gen r u c gc = do cst <- remoteCost gc cheapRemoteCost let chunksize = chunkSize c return $ encryptableRemote c - (storeEncrypted dir (getGpgOpts gc) chunksize) + (storeEncrypted dir (getGpgEncParams (c,gc)) chunksize) (retrieveEncrypted dir chunksize) Remote { uuid = u, @@ -129,7 +129,7 @@ store d chunksize k _f p = sendAnnex k (void $ remove d k) $ \src -> storeSplit meterupdate chunksize dests =<< L.readFile src -storeEncrypted :: FilePath -> GpgOpts -> ChunkSize -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool +storeEncrypted :: FilePath -> [CommandParam] -> ChunkSize -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool storeEncrypted d gpgOpts chunksize (cipher, enck) k p = sendAnnex k (void $ remove d enck) $ \src -> metered (Just p) k $ \meterupdate -> storeHelper d chunksize enck k $ \dests -> |