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 /Locations.hs | |
parent | e0bd9d43a21bae8193cb0a56be2246ee8cdafdaa (diff) |
fixed logFile
Diffstat (limited to 'Locations.hs')
-rw-r--r-- | Locations.hs | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/Locations.hs b/Locations.hs index 8f7b11a5c..d2241636e 100644 --- a/Locations.hs +++ b/Locations.hs @@ -21,7 +21,6 @@ module Locations ( gitAnnexUnusedLog, isLinkToAnnex, logFile, - logFileOld, logFileKey, hashDirMixed, @@ -119,19 +118,8 @@ isLinkToAnnex :: FilePath -> Bool isLinkToAnnex s = ("/.git/" ++ objectDir) `isInfixOf` s {- The filename of the log file for a given key. -} -logFile :: Git.Repo -> Key -> String -logFile = logFile' hashDirLower - -{- The old filename of the log file for a key. These can have mixed - - case, which turned out to be a bad idea for directories whose contents - - are checked into git. There was no conversion, so these have to be checked - - for and merged in at runtime. -} -logFileOld :: Git.Repo -> Key -> String -logFileOld = logFile' hashDirMixed - -logFile' :: (Key -> FilePath) -> Git.Repo -> Key -> String -logFile' hasher repo key = - gitStateDir repo ++ hasher key ++ keyFile key ++ ".log" +logFile :: Key -> String +logFile key = hashDirLower key ++ keyFile key ++ ".log" {- Converts a log filename into a key. -} logFileKey :: FilePath -> Maybe Key |