mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only sync with local repos that are currently available (and only fsck them too)

Browse source
This commit is contained in:
Joey Hess 2013-10-14 15:36:47 -04:00
parent a6e9386d39
commit 5e891672e5
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Assistant/Sync.hs
View file

@ -51,10 +51,12 @@ import Control.Concurrent
reconnectRemotes :: Bool -> [Remote] -> Assistant () reconnectRemotes :: Bool -> [Remote] -> Assistant ()
reconnectRemotes _ [] = noop reconnectRemotes _ [] = noop
reconnectRemotes notifypushes rs = void $ do reconnectRemotes notifypushes rs = void $ do
rs' <- filterM (checkavailable . Remote.repo) rs
unless (null rs') $ do
modifyDaemonStatus_ $ \s -> s modifyDaemonStatus_ $ \s -> s
{ desynced = S.union (S.fromList $ map Remote.uuid xmppremotes) (desynced s) } { desynced = S.union (S.fromList $ map Remote.uuid xmppremotes) (desynced s) }
void $ syncAction rs (const go) failedrs <- syncAction rs' (const go)
mapM_ signal rs mapM_ signal $ filter (`notElem` failedrs) rs'
where where
gitremotes = filter (notspecialremote . Remote.repo) rs gitremotes = filter (notspecialremote . Remote.repo) rs
(xmppremotes, nonxmppremotes) = partition isXMPPRemote rs (xmppremotes, nonxmppremotes) = partition isXMPPRemote rs
@ -80,6 +82,10 @@ reconnectRemotes notifypushes rs = void $ do
signal r = liftIO . mapM_ (flip tryPutMVar ()) signal r = liftIO . mapM_ (flip tryPutMVar ())
=<< fromMaybe [] . M.lookup (Remote.uuid r) . connectRemoteNotifiers =<< fromMaybe [] . M.lookup (Remote.uuid r) . connectRemoteNotifiers
<$> getDaemonStatus <$> getDaemonStatus
checkavailable r
| Git.repoIsLocal r || Git.repoIsLocalUnknown r =
liftIO $ doesDirectoryExist $ Git.repoPath r
| otherwise = return True
{- Updates the local sync branch, then pushes it to all remotes, in {- Updates the local sync branch, then pushes it to all remotes, in
- parallel, along with the git-annex branch. This is the same - parallel, along with the git-annex branch. This is the same