diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-01-25 21:49:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-01-25 21:49:04 -0400 |
| commit | 082b022f9ae56b1446b6607cf7851cd4f1d4f904 (patch) | |
| tree | 4712d36e841bca351c9aa68a911c4fb82188b4c1 /Backend.hs | |
| parent | 109a719b03dbeb70eb317be17f7e18567efa9dac (diff) | |
successfully split Annex and AnnexState out of TypeInternals
Diffstat (limited to 'Backend.hs')
| -rw-r--r-- | Backend.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Backend.hs b/Backend.hs index caf50005a..551c041a8 100644 --- a/Backend.hs +++ b/Backend.hs @@ -44,11 +44,11 @@ import Messages {- List of backends in the order to try them when storing a new key. -} list :: Annex [Backend Annex] list = do - l <- Annex.backends -- list is cached here + l <- Annex.getState Annex.backends -- list is cached here if not $ null l then return l else do - bs <- Annex.supportedBackends + bs <- Annex.getState Annex.supportedBackends g <- Annex.gitRepo let defaults = parseBackendList bs $ Git.configGet g "annex.backends" "" backendflag <- Annex.flagGet "backend" @@ -121,7 +121,7 @@ fsckKey backend key numcopies = (Internals.fsckKey backend) key numcopies - by examining what the file symlinks to. -} lookupFile :: FilePath -> Annex (Maybe (Key, Backend Annex)) lookupFile file = do - bs <- Annex.supportedBackends + bs <- Annex.getState Annex.supportedBackends tl <- liftIO $ try getsymlink case tl of Left _ -> return Nothing @@ -150,12 +150,12 @@ lookupFile file = do chooseBackends :: [FilePath] -> Annex [(FilePath, Maybe (Backend Annex))] chooseBackends fs = do g <- Annex.gitRepo - bs <- Annex.supportedBackends + bs <- Annex.getState Annex.supportedBackends pairs <- liftIO $ Git.checkAttr g "annex.backend" fs return $ map (\(f,b) -> (f, maybeLookupBackendName bs b)) pairs {- Returns the backend to use for a key. -} keyBackend :: Key -> Annex (Backend Annex) keyBackend key = do - bs <- Annex.supportedBackends + bs <- Annex.getState Annex.supportedBackends return $ lookupBackendName bs $ backendName key |