summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-01-11 18:49:32 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-01-11 18:49:32 -0400
commit730c273eae055eaed743593b6ab7274e210bf4e3 (patch)
tree5df3509bfbe4dacca5634dc7325aa6087ccf4cc6
parent8d6da87eec87de5317185f7bb8ebf50013e41c11 (diff)
robustness fixes for empty or missing trust log
-rw-r--r--UUID.hs6
1 files changed, 5 insertions, 1 deletions
diff --git a/UUID.hs b/UUID.hs
index 21f2b202e..67695d310 100644
--- a/UUID.hs
+++ b/UUID.hs
@@ -145,8 +145,12 @@ getTrusted :: Annex [UUID]
getTrusted = do
logfile <- trustLog
s <- liftIO $ catch (readFile logfile) ignoreerror
- return $ map (\l -> head $ words l) $ lines s
+ return $ parse s
where
+ parse [] = []
+ parse s = map firstword $ lines s
+ firstword [] = ""
+ firstword l = head $ words l
ignoreerror _ = return ""
{- Changes the list of trusted UUIDs. -}