diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-22 15:36:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-22 15:36:34 -0400 |
| commit | 6c5360cbdf20821a97a0f109ea114e4772b001e6 (patch) | |
| tree | 030a5613938276edb57e18a09063bfe4c4ed4905 /Assistant.hs | |
| parent | 8655ea7f8e853b7de4defbca2655b741362ecd21 (diff) | |
Detect systems that have no user name set in GECOS, and also don't have user.name set in git config, and put in a workaround so that commits to the git-annex branch (and the assistant) will still succeed despite git not liking the system configuration.
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Assistant.hs b/Assistant.hs index 92cc275b5..e24614517 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -154,7 +154,6 @@ import Assistant.Threads.XMPPClient #warning Building without the webapp. You probably need to install Yesod.. import Assistant.Types.UrlRenderer #endif -import Assistant.Environment import qualified Utility.Daemon import Utility.LogFile import Utility.ThreadScheduler @@ -198,8 +197,6 @@ startDaemon assistant foreground listenhost startbrowser = do | otherwise = "watch" start daemonize webappwaiter = withThreadState $ \st -> do checkCanWatch - when assistant - checkEnvironment dstatus <- startDaemonStatus logfile <- fromRepo gitAnnexLogFile liftIO $ debugM desc $ "logging to " ++ logfile |