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

migrate and rekey v6 unlocked file support

Browse source
This commit is contained in:
Joey Hess 2016-01-07 14:51:28 -04:00
parent 0b59fb423e
commit 3b960d1422
Failed to extract signature
3 changed files with 76 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Command/Migrate.hs
View file

@ -74,9 +74,12 @@ perform file oldkey oldbackend newbackend = go =<< genkey
| knowngoodcontent = finish newkey
| otherwise = stopUnless checkcontent $ finish newkey
checkcontent = Command.Fsck.checkBackend oldbackend oldkey Command.Fsck.KeyLocked $ Just file
finish newkey = stopUnless (Command.ReKey.linkKey oldkey newkey) $ do
copyMetaData oldkey newkey
next $ Command.ReKey.cleanup file oldkey newkey
finish newkey = ifM (Command.ReKey.linkKey file oldkey newkey)
( do
copyMetaData oldkey newkey
next $ Command.ReKey.cleanup file oldkey newkey
, error "failed"
)
genkey = case maybe Nothing (\fm -> fm oldkey newbackend (Just file)) (fastMigrate oldbackend) of
Just newkey -> return $ Just (newkey, True)
Nothing -> do