summaryrefslogtreecommitdiff
path: root/Assistant/Threads/MountWatcher.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-05 14:49:47 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-05 14:49:47 -0400
commitcb0f435d948a597429db5e51f2b3d2b15294090f (patch)
tree3334d153133668abc296b7343899b5cf64ae28f1 /Assistant/Threads/MountWatcher.hs
parentccedd06023b0c2f189ff157e29b6295f984c9624 (diff)
adding removable drive repos now basically works
Diffstat (limited to 'Assistant/Threads/MountWatcher.hs')
-rw-r--r--Assistant/Threads/MountWatcher.hs13
1 files changed, 1 insertions, 12 deletions
diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs
index 9a3396285..51c7590ea 100644
--- a/Assistant/Threads/MountWatcher.hs
+++ b/Assistant/Threads/MountWatcher.hs
@@ -22,10 +22,8 @@ import Utility.ThreadScheduler
import Utility.Mounts
import Remote.List
import qualified Types.Remote as Remote
-import qualified Remote.Git
import qualified Command.Sync
import Assistant.Threads.Merger
-import Logs.Remote
import Control.Concurrent
import qualified Control.Exception as E
@@ -194,17 +192,8 @@ remotesUnder st dstatus dir = runThreadState st $ do
where
checkremote repotop r = case Remote.path r of
Just p | dirContains dir (absPathFrom repotop p) ->
- (,) <$> pure True <*> updateremote r
+ (,) <$> pure True <*> updateRemote r
_ -> return (False, r)
- updateremote r = do
- liftIO $ debug thisThread ["updating", show r]
- m <- readRemoteLog
- repo <- updaterepo $ Remote.repo r
- remoteGen m (Remote.remotetype r) repo
- updaterepo repo
- | Git.repoIsLocal repo || Git.repoIsLocalUnknown repo =
- Remote.Git.configRead repo
- | otherwise = return repo
type MountPoints = S.Set Mntent