diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-22 16:13:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-22 16:17:16 -0400 |
| commit | 1870186632e3d4f99e9b87f71f0ddea83ad04568 (patch) | |
| tree | 2abd0484a9a729c8ec79997e25d5d5d92e0bdf3b /Upgrade | |
| parent | e0bd9d43a21bae8193cb0a56be2246ee8cdafdaa (diff) | |
fixed logFile
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V1.hs | 2 | ||||
| -rw-r--r-- | Upgrade/V2.hs | 10 |
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" |