This commit is contained in:
Joey Hess 2013-10-02 22:59:07 -04:00
parent f25991ca33
commit 3ac9c4e672
11 changed files with 52 additions and 54 deletions

View file

@ -34,7 +34,7 @@ import qualified Control.Exception as E
#endif
mountWatcherThread :: NamedThread
mountWatcherThread = namedThread "MountWatcher" $
mountWatcherThread = namedThread "MountWatcher"
#if WITH_DBUS
dbusThread
#else
@ -173,10 +173,10 @@ remotesUnder dir = do
rs <- liftAnnex remoteList
pairs <- liftAnnex $ mapM (checkremote repotop) rs
let (waschanged, rs') = unzip pairs
when (any id waschanged) $ do
when (or waschanged) $ do
liftAnnex $ Annex.changeState $ \s -> s { Annex.remotes = catMaybes rs' }
updateSyncRemotes
return $ catMaybes $ map snd $ filter fst pairs
return $ mapMaybe snd $ filter fst pairs
where
checkremote repotop r = case Remote.localpath r of
Just p | dirContains dir (absPathFrom repotop p) ->