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

rekey --force: Incorrectly marked the new key's content as being present in the local repo even when it was not.

Browse source
This commit is contained in:
Joey Hess 2016-12-19 18:18:57 -04:00
parent 8136c72fa1
commit a171e576b2
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -19,6 +19,8 @@ git-annex (6.20161211) UNRELEASED; urgency=medium
* Debian: Build webapp on armel. * Debian: Build webapp on armel.
* Linux standalone: Improve generation of locale definition files, * Linux standalone: Improve generation of locale definition files,
supporting locales such as, en_GB.UTF-8. supporting locales such as, en_GB.UTF-8.
* rekey --force: Incorrectly marked the new key's content as being
present in the local repo even when it was not.
-- Joey Hess <id@joeyh.name> Sun, 11 Dec 2016 21:29:51 -0400 -- Joey Hess <id@joeyh.name> Sun, 11 Dec 2016 21:29:51 -0400

4
Command/ReKey.hs
View file

@ -126,6 +126,6 @@ cleanup file oldkey newkey = do
Database.Keys.removeAssociatedFile oldkey Database.Keys.removeAssociatedFile oldkey
=<< inRepo (toTopFilePath file) =<< inRepo (toTopFilePath file)
) )
whenM (inAnnex newkey) $
logStatus newkey InfoPresent logStatus newkey InfoPresent
return True return True