summaryrefslogtreecommitdiff
path: root/UUID.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-27 21:43:25 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-27 21:43:25 -0400
commit6b5918c295715d0599005c9367f5dab5468169c5 (patch)
treebf54f1fc8b75084d3f1ddd74c260c8521e1eb51c /UUID.hs
parent28bf28a73c503c7c2d9add38e964149355bb9e50 (diff)
some reorg and further remote generalization
Diffstat (limited to 'UUID.hs')
-rw-r--r--UUID.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/UUID.hs b/UUID.hs
index 5caf11045..eb1fb319c 100644
--- a/UUID.hs
+++ b/UUID.hs
@@ -35,6 +35,7 @@ import Locations
import qualified Annex
import Utility
import qualified SysConfig
+import Config
type UUID = String
@@ -69,7 +70,7 @@ getUUID r = do
else return c
where
cached g = Git.configGet g cachekey ""
- updatecache g u = when (g /= r) $ Annex.setConfig cachekey u
+ updatecache g u = when (g /= r) $ setConfig cachekey u
cachekey = "remote." ++ fromMaybe "" (Git.repoRemoteName r) ++ ".annex-uuid"
getUncachedUUID :: Git.Repo -> UUID
@@ -82,7 +83,7 @@ prepUUID = do
u <- getUUID g
when ("" == u) $ do
uuid <- liftIO $ genUUID
- Annex.setConfig configkey uuid
+ setConfig configkey uuid
{- Pretty-prints a list of UUIDs -}
prettyPrintUUIDs :: [UUID] -> Annex String