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

better name

Browse source
This commit is contained in:
Joey Hess 2012-08-22 15:37:26 -04:00
parent 5c3e14649e
commit 546ba8b7e1
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Assistant/Sync.hs
View file

@ -31,9 +31,9 @@ import qualified Data.Map as M
- if the git-annex branches of the remotes have diverged from the - if the git-annex branches of the remotes have diverged from the
- local git-annex branch. - local git-annex branch.
-} -}
syncRemotes :: ThreadName -> ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> [Remote] -> IO () reconnectRemotes :: ThreadName -> ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> [Remote] -> IO ()
syncRemotes _ _ _ _ [] = noop reconnectRemotes _ _ _ _ [] = noop
syncRemotes threadname st dstatus scanremotes rs = void $ reconnectRemotes threadname st dstatus scanremotes rs = void $
alertWhile dstatus (syncAlert rs) $ do alertWhile dstatus (syncAlert rs) $ do
sync =<< runThreadState st (inRepo Git.Branch.current) sync =<< runThreadState st (inRepo Git.Branch.current)
where where

2
Assistant/Threads/MountWatcher.hs
View file

@ -142,7 +142,7 @@ handleMounts st dstatus scanremotes wasmounted nowmounted =
handleMount :: ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> FilePath -> IO () handleMount :: ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> FilePath -> IO ()
handleMount st dstatus scanremotes dir = do handleMount st dstatus scanremotes dir = do
debug thisThread ["detected mount of", dir] debug thisThread ["detected mount of", dir]
syncRemotes thisThread st dstatus scanremotes reconnectRemotes thisThread st dstatus scanremotes
=<< filter (Git.repoIsLocal . Remote.repo) =<< filter (Git.repoIsLocal . Remote.repo)
<$> remotesUnder st dstatus dir <$> remotesUnder st dstatus dir

2
Assistant/Threads/NetWatcher.hs
View file

@ -124,7 +124,7 @@ pollingThread st dstatus scanremotes = runEvery (Seconds 3600) $
handleConnection :: ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> IO () handleConnection :: ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> IO ()
handleConnection st dstatus scanremotes = do handleConnection st dstatus scanremotes = do
syncRemotes thisThread st dstatus scanremotes =<< reconnectRemotes thisThread st dstatus scanremotes =<<
filter (Git.repoIsUrl . Remote.repo) filter (Git.repoIsUrl . Remote.repo)
<$> networkRemotes st <$> networkRemotes st