summaryrefslogtreecommitdiff
path: root/Assistant/MakeRemote.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-09-26 15:24:23 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-09-26 15:24:23 -0400
commitda469ad8b691979fb45f688700241b236c68c53e (patch)
tree5c69416c2b30057b70dd68bbac9ab0d30e16d72f /Assistant/MakeRemote.hs
parent500e71e8f61224cc7777e87c53b0f0a280a0e5c6 (diff)
allow enabling existing S3 repos
Diffstat (limited to 'Assistant/MakeRemote.hs')
-rw-r--r--Assistant/MakeRemote.hs7
1 files 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. -}