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

Merge branch 'master' into newchunks

Browse source
This commit is contained in:
Joey Hess 2014-07-26 12:02:48 -04:00
commit e4cb50db33
6 changed files with 113 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,
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