diff options
author | Joey Hess <joey@kitenet.net> | 2011-06-01 19:10:38 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-06-01 19:11:27 -0400 |
commit | 971ab27e7820a3228f71dd42f3e870c0fc2f4345 (patch) | |
tree | f54a3fed5d3a161c5e6caff8954002f830ec8eed /Trust.hs | |
parent | 80efafe4960e0fb33d1e6783bd34eaf459febea1 (diff) |
better types allowed breaking module dep loop
Diffstat (limited to 'Trust.hs')
-rw-r--r-- | Trust.hs | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -23,7 +23,6 @@ import Types import UUID import Locations import qualified Annex -import qualified Remote import Utility {- Filename of trust.log. -} @@ -43,14 +42,11 @@ trustGet level = do trustMap :: Annex (M.Map UUID TrustLevel) trustMap = do logfile <- trustLog - overrides <- Annex.getState Annex.forcetrust >>= mapM findoverride + overrides <- Annex.getState Annex.forcetrust s <- liftIO $ catch (readFile logfile) ignoreerror return $ M.fromList $ trustMapParse s ++ overrides where ignoreerror _ = return "" - findoverride (name, t) = do - uuid <- Remote.nameToUUID name - return (uuid, t) {- Trust map parser. -} trustMapParse :: String -> [(UUID, TrustLevel)] |