summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-11-07 23:21:22 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-11-08 00:17:54 -0400
commitb11a63a860e8446cf3a4b35a5d8ef76329d5135c (patch)
treec8ae0c94d6473a3ccc7b15bdbc72d5b5c6ae96b3 /Command
parentfdf988be6d2b3bb931a9eb3dcf3fbb83b1fb8c17 (diff)
clean up read/show abuse
Avoid ever using read to parse a non-haskell formatted input string. show :: Key is arguably still show abuse, but displaying Keys as filenames is just too useful to give up.
Diffstat (limited to 'Command')
-rw-r--r--Command/ConfigList.hs2
-rw-r--r--Command/Map.hs3
2 files changed, 3 insertions, 2 deletions
diff --git a/Command/ConfigList.hs b/Command/ConfigList.hs
index fadcbb843..dcf4d1509 100644
--- a/Command/ConfigList.hs
+++ b/Command/ConfigList.hs
@@ -21,5 +21,5 @@ seek = [withNothing start]
start :: CommandStart
start = do
u <- getUUID
- liftIO $ putStrLn $ "annex.uuid=" ++ show u
+ liftIO $ putStrLn $ "annex.uuid=" ++ fromUUID u
stop
diff --git a/Command/Map.hs b/Command/Map.hs
index 803324e99..11808ed63 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -62,7 +62,8 @@ drawMap rs umap ts = Dot.graph $ repos ++ trusted ++ others
others = map (unreachable . uuidnode) $
filter (`notElem` ruuids) (M.keys umap)
trusted = map (trustworthy . uuidnode) ts
- uuidnode u = Dot.graphNode (show u) $ M.findWithDefault "" u umap
+ uuidnode u = Dot.graphNode (fromUUID u) $
+ M.findWithDefault "" u umap
hostname :: Git.Repo -> String
hostname r