diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-14 15:52:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-14 16:07:59 -0400 |
| commit | 3780a5eb0a01e3d31fc0de2410f7b01518710a0e (patch) | |
| tree | 0b187086ee7cb6ed6dd1c49b4dd0871c856a27cd /Assistant | |
| parent | d6adaf499124c11e3d79252821ef400d2a87b155 (diff) | |
move thirdparty program installation for standalone bundle into haskell program
This allows it to use Build.SysConfig to always install the programs
configure detected. Amoung other fixes, this ensures the right uuid
generator and checksum programs are installed.
I also cleaned up the handling of lsof's path; configure now checks for
it in PATH, but falls back to looking for it in sbin directories.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index f7e4e2df2..08689cca4 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -24,6 +24,7 @@ import Assistant.Drop import Logs.Transfer import Utility.DirWatcher import Utility.Types.DirWatcher +import Utility.Lsof import qualified Annex import qualified Annex.Queue import qualified Git.Command @@ -39,7 +40,8 @@ import qualified Data.ByteString.Lazy as L checkCanWatch :: Annex () checkCanWatch - | canWatch = + | canWatch = do + liftIO setupLsof unlessM (liftIO (inPath "lsof") <||> Annex.getState Annex.force) needLsof | otherwise = error "watch mode is not available on this system" |