diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-15 22:53:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-15 22:53:14 -0400 |
| commit | 49b7f5918341c30140779ea1f376b4d9f81d8a30 (patch) | |
| tree | 454772293be974bb79bf8c7f42aea9740d0bca77 /Remotes.hs | |
| parent | 9d24cc7bdb011d66e41229a3b96401808be47268 (diff) | |
test suite passes again
doesn't test remote functionality.. but that may be working too now
Diffstat (limited to 'Remotes.hs')
| -rw-r--r-- | Remotes.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Remotes.hs b/Remotes.hs index dd733e454..8b760ac95 100644 --- a/Remotes.hs +++ b/Remotes.hs @@ -27,7 +27,6 @@ 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 @@ -154,7 +153,7 @@ inAnnex r key = if Git.repoIsUrl r checkremote = do showNote ("checking " ++ Git.repoDescribe r ++ "...") inannex <- onRemote r (boolSystem, False) "inannex" - [Param ("--backend=" ++ keyBackendName key), Param (keyName key)] + [Param (show key)] return $ Right inannex {- Cost Ordered list of remotes. -} @@ -273,8 +272,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=" ++ keyBackendName key - , Param $ keyName key + [ Param $ show key -- Command is terminated with "--", because -- rsync will tack on its own options afterwards, -- and they need to be ignored. |