diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-29 11:58:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-29 11:58:29 -0400 |
| commit | 8011bedf1699147b34cc1504218a7c3bc14f1c47 (patch) | |
| tree | 3155f28e3e8e2a9825f881b0dd0b642b56af7c60 | |
| parent | f901112e1ce30f43dc7294e0bd0616bb02556500 (diff) | |
tweak
| -rw-r--r-- | Assistant.hs | 1 | ||||
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Assistant.hs b/Assistant.hs index be4cbeb9c..58561371d 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 7287c8c12..172b7976e 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 |