diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-09 14:24:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-09 14:24:17 -0400 |
| commit | adb0cccb6c438145c53b0a8ebfff168522692e87 (patch) | |
| tree | e42cfd5e0a237cbda24809319bca605426a55e3c /Assistant | |
| parent | c56c0554643cf64d1083ef2693ecff787a4731c3 (diff) | |
webapp automatic grouping
webapp: Adds newly created repositories to one of these groups:
clients, drives, servers
This is heuristic, but it's a pretty good heuristic, and can always be
configured.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/MakeRemote.hs | 3 | ||||
| -rw-r--r-- | Assistant/Pairing/MakeRemote.hs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Assistant/MakeRemote.hs b/Assistant/MakeRemote.hs index 9184cb529..cce2da0af 100644 --- a/Assistant/MakeRemote.hs +++ b/Assistant/MakeRemote.hs @@ -28,11 +28,12 @@ import qualified Data.Map as M import Data.Char {- Sets up and begins syncing with a new ssh or rsync remote. -} -makeSshRemote :: ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> Bool -> SshData -> IO () +makeSshRemote :: ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> Bool -> SshData -> IO Remote makeSshRemote st dstatus scanremotes forcersync sshdata = do r <- runThreadState st $ addRemote $ maker (sshRepoName sshdata) sshurl syncNewRemote st dstatus scanremotes r + return r where rsync = forcersync || rsyncOnly sshdata maker diff --git a/Assistant/Pairing/MakeRemote.hs b/Assistant/Pairing/MakeRemote.hs index fae8c5ee3..ab0bef13c 100644 --- a/Assistant/Pairing/MakeRemote.hs +++ b/Assistant/Pairing/MakeRemote.hs @@ -46,7 +46,7 @@ finishedPairing st dstatus scanremotes msg keypair = do , "git-annex-shell -c configlist " ++ T.unpack (sshDirectory sshdata) ] "" - makeSshRemote st dstatus scanremotes False sshdata + void $ makeSshRemote st dstatus scanremotes False sshdata {- Mostly a straightforward conversion. Except: - * Determine the best hostname to use to contact the host. |