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/Helper/Encryptable.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/Helper/Encryptable.hs')
| -rw-r--r-- | Remote/Helper/Encryptable.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs index 0569cb555..bcecb30cc 100644 --- a/Remote/Helper/Encryptable.hs +++ b/Remote/Helper/Encryptable.hs @@ -40,7 +40,7 @@ encryptionSetup c = encryptableRemote :: Maybe RemoteConfig -> ((Cipher, Key) -> Key -> Annex Bool) - -> ((Cipher, Key) -> FilePath -> Annex Bool) + -> ((Cipher, Key) -> Key -> FilePath -> Annex Bool) -> Remote -> Remote encryptableRemote c storeKeyEncrypted retrieveKeyFileEncrypted r = @@ -58,7 +58,7 @@ encryptableRemote c storeKeyEncrypted retrieveKeyFileEncrypted r = (`storeKeyEncrypted` k) retrieve k f = cip k >>= maybe (retrieveKeyFile r k f) - (`retrieveKeyFileEncrypted` f) + (\enck -> retrieveKeyFileEncrypted enck k f) retrieveCheap k f = cip k >>= maybe (retrieveKeyFileCheap r k f) (\_ -> return False) |