make programPath return FilePath not Maybe FilePath

Looking at the few current callers, it's ok to have programPath throw an
exception, in the unusual case where it cannot find git-annex.
This commit is contained in:
Joey Hess 2015-02-28 16:59:52 -04:00
parent ad1f4a7f1c
commit b9275b65f9
4 changed files with 17 additions and 20 deletions

View file

@ -36,8 +36,7 @@ upgradeWatcherThread urlrenderer = namedThread "UpgradeWatcher" $ do
showSuccessfulUpgrade urlrenderer
go =<< liftIO upgradeFlagFile
where
go Nothing = debug [ "cannot determine program path" ]
go (Just flagfile) = do
go flagfile = do
mvar <- liftIO $ newMVar InStartupScan
changed <- Just <$> asIO2 (changedFile urlrenderer mvar flagfile)
let hooks = mkWatchHooks