mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix cost calculation for non-encrypted remotes.

Browse source 
Encyptable types of remotes that were not actually encrypted still had
the encryptedRemoteCostAdj applied to their configured cost, which was a
bug.
This commit is contained in:
Joey Hess 2014-07-25 17:29:59 -04:00
parent 014794f4ed
commit 005aded3e0
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Remote/Helper/Encryptable.hs
View file

@ -87,7 +87,10 @@ encryptableRemote c storeKeyEncrypted retrieveKeyFileEncrypted r =
retrieveKeyFileCheap = retrieveCheap, retrieveKeyFileCheap = retrieveCheap,
removeKey = withkey $ removeKey r, removeKey = withkey $ removeKey r,
hasKey = withkey $ hasKey r, hasKey = withkey $ hasKey r,
cost = cost r + encryptedRemoteCostAdj cost = maybe
(cost r)
(const $ cost r + encryptedRemoteCostAdj)
(extractCipher c)
} }
where where
store k f p = cip k >>= maybe store k f p = cip k >>= maybe

1
debian/changelog vendored
View file

@ -6,6 +6,7 @@ git-annex (5.20140718) UNRELEASED; urgency=medium
unreachable objects, but some branches no longer accessible. unreachable objects, but some branches no longer accessible.
Fix this, including support for fixing up repositories that Fix this, including support for fixing up repositories that
were incompletely repaired before. were incompletely repaired before.
* Fix cost calculation for non-encrypted remotes.
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2014 14:41:26 -0400 -- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2014 14:41:26 -0400