diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-01-27 17:00:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-01-27 17:00:32 -0400 |
| commit | 167523f09d48777f3a5931fdcbc21b9d363e0e6c (patch) | |
| tree | 698c1c601b39b617ccc02259053c3c39372ed5db /Upgrade.hs | |
| parent | 6be516ae3bddb8f05ea62661019836e03be12a2c (diff) | |
better directory handling
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.
Diffstat (limited to 'Upgrade.hs')
| -rw-r--r-- | Upgrade.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Upgrade.hs b/Upgrade.hs index 596d525db..1e70e68d5 100644 --- a/Upgrade.hs +++ b/Upgrade.hs @@ -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] |