mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

webapp now starts up when run not in a git repo

Browse source
This commit is contained in:
Joey Hess 2012-07-31 12:17:31 -04:00
parent b9b0097876
commit 04794eafc0
8 changed files with 96 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant.hs
View file

@ -122,7 +122,7 @@ import Utility.ThreadScheduler
import Control.Concurrent
startDaemon :: Bool -> Bool -> Maybe (IO ()) -> Annex ()
startDaemon :: Bool -> Bool -> Maybe (FilePath -> IO ()) -> Annex ()
startDaemon assistant foreground webappwaiter
| foreground = do
showStart (if assistant then "assistant" else "watch") "."
@ -155,7 +155,7 @@ startDaemon assistant foreground webappwaiter
, mountWatcherThread st dstatus scanremotes
, transferScannerThread st dstatus scanremotes transferqueue
#ifdef WITH_WEBAPP
, webAppThread st dstatus transferqueue webappwaiter
, webAppThread (Just st) dstatus transferqueue webappwaiter
#endif
, watchThread st dstatus transferqueue changechan
]