summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-17 14:58:35 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-17 14:58:35 -0400
commitfd17f8e97390ffa72e90a4532c10f2848764c580 (patch)
tree3ff329e640a11b6c3ef62859896e7390dd23b1f7 /Assistant
parent9ed7e9be8f32b3795c5252641a11f3500a6dea28 (diff)
webapp: Check annex.version.
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/WebApp.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs
index a5f4f4201..b380094d6 100644
--- a/Assistant/Threads/WebApp.hs
+++ b/Assistant/Threads/WebApp.hs
@@ -52,11 +52,12 @@ webAppThread
:: AssistantData
-> UrlRenderer
-> Bool
+ -> Maybe String
-> Maybe HostName
-> Maybe (IO Url)
-> Maybe (Url -> FilePath -> IO ())
-> NamedThread
-webAppThread assistantdata urlrenderer noannex listenhost postfirstrun onstartup = thread $ liftIO $ do
+webAppThread assistantdata urlrenderer noannex cannotrun listenhost postfirstrun onstartup = thread $ liftIO $ do
#ifdef __ANDROID__
when (isJust listenhost) $
-- See Utility.WebApp
@@ -68,6 +69,7 @@ webAppThread assistantdata urlrenderer noannex listenhost postfirstrun onstartup
<*> getreldir
<*> pure staticRoutes
<*> pure postfirstrun
+ <*> pure cannotrun
<*> pure noannex
<*> pure listenhost
setUrlRenderer urlrenderer $ yesodRender webapp (pack "")