From da469ad8b691979fb45f688700241b236c68c53e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Sep 2012 15:24:23 -0400 Subject: allow enabling existing S3 repos --- Assistant/MakeRemote.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Assistant/MakeRemote.hs b/Assistant/MakeRemote.hs index 73efcdaed..729b5126a 100644 --- a/Assistant/MakeRemote.hs +++ b/Assistant/MakeRemote.hs @@ -58,7 +58,7 @@ addRemote a = do {- Inits a rsync special remote, and returns its name. -} makeRsyncRemote :: String -> String -> Annex String makeRsyncRemote name location = makeRemote name location $ - const $ void $ makeSpecialRemote name Rsync.remote config + const $ makeSpecialRemote name Rsync.remote config where config = M.fromList [ ("encryption", "shared") @@ -66,14 +66,13 @@ makeRsyncRemote name location = makeRemote name location $ , ("type", "rsync") ] -{- Inits a special remote, and returns its name. -} -makeSpecialRemote :: String -> RemoteType -> R.RemoteConfig -> Annex String +{- Inits a special remote. -} +makeSpecialRemote :: String -> RemoteType -> R.RemoteConfig -> Annex () makeSpecialRemote name remotetype config = do (u, c) <- Command.InitRemote.findByName name c' <- R.setup remotetype u $ M.union config c describeUUID u name configSet u c' - return name {- Returns the name of the git remote it created. If there's already a - remote at the location, returns its name. -} -- cgit v1.2.3