diff options
| -rw-r--r-- | Remote/Helper/Encryptable.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 5 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 diff --git a/debian/changelog b/debian/changelog index 5509b76e0..bbdea7b7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ git-annex (5.20140718) UNRELEASED; urgency=medium unreachable objects, but some branches no longer accessible. Fix this, including support for fixing up repositories that were incompletely repaired before. + * Fix cost calculation for non-encrypted remotes. -- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2014 14:41:26 -0400 |