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

better directory handling

Browse source 
Rename Locations functions for better consitency, and make their values
more consistent too.

Used </> rather than manually building paths. There are still more places
that manually do so, but are tricky, due to the behavior of </> when
the second FilePath is absolute. So I only changed places where
it obviously was relative.
This commit is contained in:
Joey Hess 2011-01-27 17:00:32 -04:00
parent 6be516ae3b
commit 167523f09d
16 changed files with 78 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Upgrade.hs
View file

@ -39,9 +39,9 @@ upgradeFrom0 = do
g <- Annex.gitRepo
-- do the reorganisation of the files
let olddir = annexDir g
let olddir = gitAnnexDir g
keys <- getKeysPresent0' olddir
_ <- mapM (\k -> moveAnnex k $ olddir ++ "/" ++ keyFile k) keys
_ <- mapM (\k -> moveAnnex k $ olddir </> keyFile k) keys
-- update the symlinks to the files
files <- liftIO $ Git.inRepo g [Git.workTree g]