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

migrate, rekey: copy rather than hard linking in crippled filesystem mode

Browse source
This commit is contained in:
Joey Hess 2013-02-15 13:51:50 -04:00
parent 96613e85a9
commit 5e6a60c17d
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Command/ReKey.hs
View file

@ -14,6 +14,8 @@ import Types.Key
import Annex.Content import Annex.Content
import qualified Command.Add import qualified Command.Add
import Logs.Web import Logs.Web
import Config
import Utility.CopyFile
def :: [Command] def :: [Command]
def = [notDirect $ command "rekey" def = [notDirect $ command "rekey"
@ -48,8 +50,15 @@ perform file oldkey newkey = do
linkKey :: Key -> Key -> Annex Bool linkKey :: Key -> Key -> Annex Bool
linkKey oldkey newkey = getViaTmpUnchecked newkey $ \tmp -> do linkKey oldkey newkey = getViaTmpUnchecked newkey $ \tmp -> do
src <- inRepo $ gitAnnexLocation oldkey src <- inRepo $ gitAnnexLocation oldkey
liftIO $ unlessM (doesFileExist tmp) $ createLink src tmp ifM (liftIO $ doesFileExist tmp)
return True ( return True
, ifM crippledFileSystem
( liftIO $ copyFileExternal src tmp
, do
liftIO $ createLink src tmp
return True
)
)
cleanup :: FilePath -> Key -> Key -> CommandCleanup cleanup :: FilePath -> Key -> Key -> CommandCleanup
cleanup file oldkey newkey = do cleanup file oldkey newkey = do

1
doc/design/assistant/android.mdwn
View file

@ -22,5 +22,4 @@ file modes, etc.
## TODO ## TODO
* migrate creates hard links between old and new keys
* avoid all symlink creation in crippled filesystem + direct mode * avoid all symlink creation in crippled filesystem + direct mode