summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-22 16:30:34 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-22 16:30:34 -0400
commit235e2e63a13c629dcca1aa1638f5f47a8d3983ba (patch)
tree968030d038473f5b732c561711e1f9cf2b1be105
parent1870186632e3d4f99e9b87f71f0ddea83ad04568 (diff)
move
-rw-r--r--Locations.hs5
-rw-r--r--UUID.hs6
2 files changed, 6 insertions, 5 deletions
diff --git a/Locations.hs b/Locations.hs
index d2241636e..9175c4f61 100644
--- a/Locations.hs
+++ b/Locations.hs
@@ -20,6 +20,7 @@ module Locations (
gitAnnexBadLocation,
gitAnnexUnusedLog,
isLinkToAnnex,
+ uuidLog,
logFile,
logFileKey,
hashDirMixed,
@@ -117,6 +118,10 @@ gitAnnexUnusedLog prefix r = gitAnnexDir r </> (prefix ++ "unused")
isLinkToAnnex :: FilePath -> Bool
isLinkToAnnex s = ("/.git/" ++ objectDir) `isInfixOf` s
+{- Filename of uuid.log. -}
+uuidLog :: FilePath
+uuidLog = "uuid.log"
+
{- The filename of the log file for a given key. -}
logFile :: Key -> String
logFile key = hashDirLower key ++ keyFile key ++ ".log"
diff --git a/UUID.hs b/UUID.hs
index c02f51480..78667f235 100644
--- a/UUID.hs
+++ b/UUID.hs
@@ -19,7 +19,6 @@ module UUID (
genUUID,
prettyPrintUUIDs,
describeUUID,
- uuidLog,
uuidMap
) where
@@ -36,6 +35,7 @@ import Types.UUID
import qualified Annex
import qualified SysConfig
import Config
+import Locations
configkey :: String
configkey = "annex.uuid"
@@ -116,7 +116,3 @@ uuidMap = do
if 1 < length (words l)
then (head $ words l, unwords $ drop 1 $ words l)
else ("", "")
-
-{- Filename of uuid.log. -}
-uuidLog :: FilePath
-uuidLog = "uuid.log"