diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-30 14:44:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-30 14:44:18 -0400 |
| commit | bab7e83221468905b76e28bb123ebe26e146b97b (patch) | |
| tree | 19b3bf6d56f936a81c09be7b552c3a8616d45e27 /Assistant/Threads/Watcher.hs | |
| parent | ca03b7fef80cf97e89cd785ec8393a27d5328d99 (diff) | |
cleanup daemonStatus accessors
Diffstat (limited to 'Assistant/Threads/Watcher.hs')
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index dee71b731..8d155ecb1 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -133,18 +133,18 @@ onAddSymlink file filestatus = go =<< liftAnnex (Backend.lookupFile file) link <- liftAnnex $ calcGitLink file key ifM ((==) link <$> liftIO (readSymbolicLink file)) ( do - s <- daemonStatus + s <- getDaemonStatus checkcontent key s ensurestaged link s , do liftIO $ removeFile file liftIO $ createSymbolicLink link file - checkcontent key =<< daemonStatus + checkcontent key =<< getDaemonStatus addlink link ) go Nothing = do -- other symlink link <- liftIO (readSymbolicLink file) - ensurestaged link =<< daemonStatus + ensurestaged link =<< getDaemonStatus {- This is often called on symlinks that are already - staged correctly. A symlink may have been deleted |