better types allowed breaking module dep loop
This commit is contained in:
parent
80efafe496
commit
971ab27e78
9 changed files with 64 additions and 70 deletions
|
@ -21,7 +21,6 @@ import Data.String.Utils
|
|||
import BackendClass
|
||||
import LocationLog
|
||||
import qualified Remote
|
||||
import qualified RemoteUtils
|
||||
import qualified GitRepo as Git
|
||||
import Content
|
||||
import qualified Annex
|
||||
|
@ -54,7 +53,7 @@ dummyStore _ _ = return True
|
|||
- and copy it to here. -}
|
||||
copyKeyFile :: Key -> FilePath -> Annex Bool
|
||||
copyKeyFile key file = do
|
||||
(remotes, _) <- RemoteUtils.keyPossibilities key
|
||||
(remotes, _) <- Remote.keyPossibilities key
|
||||
if null remotes
|
||||
then do
|
||||
showNote "not available"
|
||||
|
@ -97,7 +96,7 @@ checkRemoveKey key numcopiesM = do
|
|||
if force || numcopiesM == Just 0
|
||||
then return True
|
||||
else do
|
||||
(remotes, trusteduuids) <- RemoteUtils.keyPossibilities key
|
||||
(remotes, trusteduuids) <- Remote.keyPossibilities key
|
||||
untrusteduuids <- trustGet UnTrusted
|
||||
let tocheck = Remote.remotesWithoutUUID remotes (trusteduuids++untrusteduuids)
|
||||
numcopies <- getNumCopies numcopiesM
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue