diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-15 21:34:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-15 21:34:13 -0400 |
| commit | 9d49fe2c172b135a1a3735827df014b5f45d99a2 (patch) | |
| tree | 32caea71926c1b05d9b1921a16f364f57fc3e62f /Remotes.hs | |
| parent | 675ee89749ba2272d37b763078020b6e5f4cd380 (diff) | |
first pass at using new keys
It compiles. It sorta works. Several subcommands are FIXME marked and
broken, because things that used to accept separate --backend and --key
params need to be changed to accept just a --key that encodes all the key
info, now that there is metadata in keys.
Diffstat (limited to 'Remotes.hs')
| -rw-r--r-- | Remotes.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Remotes.hs b/Remotes.hs index 3c9db314c..dd733e454 100644 --- a/Remotes.hs +++ b/Remotes.hs @@ -27,6 +27,7 @@ import Data.List (intersect, sortBy) import Control.Monad (when, unless, filterM) import Types +import Key import qualified GitRepo as Git import qualified Annex import LocationLog @@ -153,7 +154,7 @@ inAnnex r key = if Git.repoIsUrl r checkremote = do showNote ("checking " ++ Git.repoDescribe r ++ "...") inannex <- onRemote r (boolSystem, False) "inannex" - [Param ("--backend=" ++ backendName key), Param (keyName key)] + [Param ("--backend=" ++ keyBackendName key), Param (keyName key)] return $ Right inannex {- Cost Ordered list of remotes. -} @@ -272,7 +273,7 @@ rsyncParams :: Git.Repo -> Bool -> Key -> FilePath -> Annex [CommandParam] rsyncParams r sending key file = do Just (shellcmd, shellparams) <- git_annex_shell r (if sending then "sendkey" else "recvkey") - [ Param $ "--backend=" ++ backendName key + [ Param $ "--backend=" ++ keyBackendName key , Param $ keyName key -- Command is terminated with "--", because -- rsync will tack on its own options afterwards, |