From 6c5360cbdf20821a97a0f109ea114e4772b001e6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 22 Apr 2013 15:36:34 -0400 Subject: 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. --- Assistant.hs | 3 --- 1 file changed, 3 deletions(-) (limited to 'Assistant.hs') 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 -- cgit v1.2.3