From 0ba4df3c1ab932a0fd07cba6328808a39cfea82a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Oct 2012 11:58:29 -0400 Subject: [PATCH] tweak --- Assistant.hs | 1 - Assistant/Threads/Watcher.hs | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Assistant.hs b/Assistant.hs index be4cbeb9c4..58561371d4 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -180,7 +180,6 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do d <- getAssistant id st <- getAssistant threadState dstatus <- getAssistant daemonStatusHandle - changechan <- getAssistant changeChan commitchan <- getAssistant commitChan transferqueue <- getAssistant transferQueue transferslots <- getAssistant transferSlots diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 7287c8c125..172b7976ef 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -159,11 +159,9 @@ onAddSymlink file filestatus = go =<< liftAnnex (Backend.lookupFile file) ensurestaged link daemonstatus | scanComplete daemonstatus = addlink link | otherwise = case filestatus of - Just s | not (changedrecently s) -> liftIO noChange + Just s + | not (afterLastDaemonRun (statusChangeTime s) daemonstatus) -> liftIO noChange _ -> addlink link - where - changedrecently s = - afterLastDaemonRun (statusChangeTime s) daemonstatus {- For speed, tries to reuse the existing blob for symlink target. -} addlink link = do