diff options
author | Joey Hess <joey@kitenet.net> | 2011-10-04 00:40:47 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-10-04 00:59:08 -0400 |
commit | cfe21e85e7fba61ac588e210f2a9b75f8d081f42 (patch) | |
tree | 3237aa5460cb38254a44a6462c83db3c2276c229 /Trust.hs | |
parent | ff21fd4a652cc6516d0e06ab885adf1c93eddced (diff) |
rename
Diffstat (limited to 'Trust.hs')
-rw-r--r-- | Trust.hs | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -15,9 +15,9 @@ module Trust ( import qualified Data.Map as M -import AnnexCommon +import Annex.Common import Types.TrustLevel -import qualified Branch +import qualified Annex.Branch import UUID import qualified Annex @@ -40,7 +40,7 @@ trustMap = do Just m -> return m Nothing -> do overrides <- Annex.getState Annex.forcetrust - l <- Branch.get trustLog + l <- Annex.Branch.get trustLog let m = M.fromList $ trustMapParse l ++ overrides Annex.changeState $ \s -> s { Annex.trustmap = Just m } return m @@ -62,7 +62,7 @@ trustSet :: UUID -> TrustLevel -> Annex () trustSet uuid level = do when (null uuid) $ error "unknown UUID; cannot modify trust level" - Branch.change trustLog $ + Annex.Branch.change trustLog $ serialize . M.insert uuid level . M.fromList . trustMapParse Annex.changeState $ \s -> s { Annex.trustmap = Nothing } where |