diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-01-06 13:34:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-06 13:34:08 -0400 |
| commit | d4c642e989ab10e476757dbdc48c0d5dd6b3bb8b (patch) | |
| tree | b899309115f7e6d25af4ca941b0d4570a0f986d0 /Assistant.hs | |
| parent | f410b244d87cc1b2f9aa832253ee8704e369eb7f (diff) | |
assistant: Detect when system is not configured with a user name, and set environment to prevent git from failing.
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Assistant.hs b/Assistant.hs index a0d4ed2ff..e529df487 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -151,6 +151,7 @@ import Assistant.Threads.XMPPClient #else #warning Building without the webapp. You probably need to install Yesod.. #endif +import Assistant.Environment import qualified Utility.Daemon import Utility.LogFile import Utility.ThreadScheduler @@ -178,6 +179,7 @@ startDaemon assistant foreground webappwaiter startAssistant :: Bool -> (IO () -> IO ()) -> Maybe (String -> FilePath -> IO ()) -> Annex () startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do checkCanWatch + when assistant $ checkEnvironment dstatus <- startDaemonStatus liftIO $ daemonize $ flip runAssistant go =<< newAssistantData st dstatus |