diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-26 12:02:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-26 12:02:48 -0400 |
| commit | c3c63e48dfb3c981786bd3178e5f5689d3c60abf (patch) | |
| tree | 70347c19346d3e399f28466abb2efb8da9351c7b /Remote | |
| parent | ab98379908ee9dc91ab43f24aa65851ffd60cd37 (diff) | |
| parent | 7c5849db0897097cce70bebc7f8a5d545fdef603 (diff) | |
Merge branch 'master' into newchunks
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Helper/Encryptable.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs index a6e79ddc4..41174cf7c 100644 --- a/Remote/Helper/Encryptable.hs +++ b/Remote/Helper/Encryptable.hs @@ -87,7 +87,10 @@ encryptableRemote c storeKeyEncrypted retrieveKeyFileEncrypted r = retrieveKeyFileCheap = retrieveCheap, removeKey = withkey $ removeKey r, hasKey = withkey $ hasKey r, - cost = cost r + encryptedRemoteCostAdj + cost = maybe + (cost r) + (const $ cost r + encryptedRemoteCostAdj) + (extractCipher c) } where store k f p = cip k >>= maybe |