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

migrate: Check content before generating the new key, to avoid generating a key for corrupt data.

Browse source
This commit is contained in:
Joey Hess 2012-09-14 00:18:18 -04:00
parent ac67b4ed00
commit 7f45baee5e
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Command/Migrate.hs
View file

@ -14,6 +14,7 @@ import qualified Types.Key
import Types.KeySource import Types.KeySource
import Annex.Content import Annex.Content
import qualified Command.ReKey import qualified Command.ReKey
import qualified Command.Fsck
def :: [Command] def :: [Command]
def = [command "migrate" paramPaths seek "switch data to different backend"] def = [command "migrate" paramPaths seek "switch data to different backend"]
@ -28,7 +29,7 @@ start file (key, oldbackend) = do
if (newbackend /= oldbackend || upgradableKey key) && exists if (newbackend /= oldbackend || upgradableKey key) && exists
then do then do
showStart "migrate" file showStart "migrate" file
next $ perform file key newbackend next $ perform file key oldbackend newbackend
else stop else stop
where where
choosebackend Nothing = Prelude.head <$> orderedList choosebackend Nothing = Prelude.head <$> orderedList
@ -42,8 +43,12 @@ upgradableKey key = isNothing $ Types.Key.keySize key
{- Store the old backend's key in the new backend {- Store the old backend's key in the new backend
- The old backend's key is not dropped from it, because there may - The old backend's key is not dropped from it, because there may
- be other files still pointing at that key. -} - be other files still pointing at that key. -}
perform :: FilePath -> Key -> Backend -> CommandPerform perform :: FilePath -> Key -> Backend -> Backend -> CommandPerform
perform file oldkey newbackend = maybe stop go =<< genkey perform file oldkey oldbackend newbackend = do
ifM (Command.Fsck.checkBackend oldbackend oldkey)
( maybe stop go =<< genkey
, stop
)
where where
go newkey = stopUnless (Command.ReKey.linkKey oldkey newkey) $ go newkey = stopUnless (Command.ReKey.linkKey oldkey newkey) $
next $ Command.ReKey.cleanup file oldkey newkey next $ Command.ReKey.cleanup file oldkey newkey

2
debian/changelog vendored
View file

@ -15,6 +15,8 @@ git-annex (3.20120826) UNRELEASED; urgency=low
Closes: #682351 Thanks, gregor herrmann Closes: #682351 Thanks, gregor herrmann
* Disable ssh connection caching if the path to the control socket would be * Disable ssh connection caching if the path to the control socket would be
too long (and use relative path to minimise path to the control socket). too long (and use relative path to minimise path to the control socket).
* migrate: Check content before generating the new key, to avoid generating
a key for corrupt data.
-- Joey Hess <joeyh@debian.org> Mon, 27 Aug 2012 13:27:39 -0400 -- Joey Hess <joeyh@debian.org> Mon, 27 Aug 2012 13:27:39 -0400