aboutsummaryrefslogtreecommitdiff
path: root/Upgrade
diff options
context:
space:
mode:
Diffstat (limited to 'Upgrade')
-rw-r--r--Upgrade/V1.hs2
-rw-r--r--Upgrade/V2.hs10
2 files changed, 11 insertions, 1 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index b139e2820..1f327f77b 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -121,7 +121,7 @@ moveLocationLogs = do
else return []
move (l, k) = do
g <- Annex.gitRepo
- let dest = logFile g k
+ let dest = logFile k
let dir = gitStateDir g
let f = dir </> l
liftIO $ createDirectoryIfMissing True (parentDir dest)
diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs
index deb231d52..03ef7ba69 100644
--- a/Upgrade/V2.hs
+++ b/Upgrade/V2.hs
@@ -46,3 +46,13 @@ gitAttributesUnWrite repo = do
c <- readFileStrict attributes
safeWriteFile attributes $ unlines $
filter (\l -> not $ l `elem` attrLines) $ lines c
+
+oldlogFile :: Git.Repo -> Key -> String
+oldlogFile = logFile' hashDirLower
+
+oldlogFileOld :: Git.Repo -> Key -> String
+oldlogFileOld = logFile' hashDirMixed
+
+logFile' :: (Key -> FilePath) -> Git.Repo -> Key -> String
+logFile' hasher repo key =
+ gitStateDir repo ++ hasher key ++ keyFile key ++ ".log"