summaryrefslogtreecommitdiff
path: root/Config.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-10 13:11:16 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-10 13:32:38 -0400
commit07cacbeee95b377e1bf4111e4d4b30190956c585 (patch)
tree17249f177a6ffde3d2f524ee66a9a6b2530bd92e /Config.hs
parent0d5c4022105a393a4eac76b09940f8b22fa0a56c (diff)
break module dependancy loop
A PITA but worth it to clean up the trust configuration code.
Diffstat (limited to 'Config.hs')
-rw-r--r--Config.hs7
1 files changed, 2 insertions, 5 deletions
diff --git a/Config.hs b/Config.hs
index 0a7ac0789..83a84a1fe 100644
--- a/Config.hs
+++ b/Config.hs
@@ -12,8 +12,6 @@ import qualified Git
import qualified Git.Config
import qualified Git.Command
import qualified Annex
-import qualified Logs.Trust
-import Types.TrustLevel
type ConfigKey = String
@@ -85,6 +83,5 @@ getNumCopies v = perhaps (use v) =<< Annex.getState Annex.forcenumcopies
config = "annex.numcopies"
{- Gets the trust level set for a remote in git config. -}
-getTrustLevel :: Git.Repo -> Annex (Maybe TrustLevel)
-getTrustLevel r = maybe Nothing Logs.Trust.trustName <$>
- fromRepo (Git.Config.getMaybe (remoteConfig r "trustlevel"))
+getTrustLevel :: Git.Repo -> Annex (Maybe String)
+getTrustLevel r = fromRepo $ Git.Config.getMaybe $ remoteConfig r "trustlevel"