diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-03-04 03:36:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-03-04 03:36:39 -0400 |
| commit | 7ba79cfb8c5c2a0fcb1472ab67bb777999e8e88a (patch) | |
| tree | 361d18e7f4f42e811f2d48473012f8c3daaec0ff /Remote/S3.hs | |
| parent | 46383140015fb607ba7d9c7bf5a3c2c435dfb548 (diff) | |
thread through original key to retrieveEnctypted
Allows showing progress bar for this last case of the directory special
remote.
Diffstat (limited to 'Remote/S3.hs')
| -rw-r--r-- | Remote/S3.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 523edef65..a688ffcf3 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -161,8 +161,8 @@ retrieve r k f = s3Action r False $ \(conn, bucket) -> do retrieveCheap :: Remote -> Key -> FilePath -> Annex Bool retrieveCheap _ _ _ = return False -retrieveEncrypted :: Remote -> (Cipher, Key) -> FilePath -> Annex Bool -retrieveEncrypted r (cipher, enck) f = s3Action r False $ \(conn, bucket) -> do +retrieveEncrypted :: Remote -> (Cipher, Key) -> Key -> FilePath -> Annex Bool +retrieveEncrypted r (cipher, enck) _ f = s3Action r False $ \(conn, bucket) -> do res <- liftIO $ getObject conn $ bucketKey r bucket enck case res of Right o -> liftIO $ |