summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-02-28 16:59:52 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-02-28 16:59:52 -0400
commita35208c5df555006431a66436288ce156af4fdb9 (patch)
tree5c07d4b504f56f7f1f58a9c186a0166be67b87d8 /Assistant
parent037834477ef6ac97f9a50e02a529a4f6d2fc7b45 (diff)
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.
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/UpgradeWatcher.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/Assistant/Threads/UpgradeWatcher.hs b/Assistant/Threads/UpgradeWatcher.hs
index e779c8e54..952db1f13 100644
--- a/Assistant/Threads/UpgradeWatcher.hs
+++ b/Assistant/Threads/UpgradeWatcher.hs
@@ -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