diff --git a/Utility/Daemon.hs b/Utility/Daemon.hs index 39c42bf53c..23d18d2b60 100644 --- a/Utility/Daemon.hs +++ b/Utility/Daemon.hs @@ -39,7 +39,7 @@ daemonize logfd pidfile changedirectory a = do checkalreadyrunning f = maybe noop (const alreadyRunning) =<< checkDaemon f child1 = do - _ <- createSession + _ <- tryIO createSession _ <- forkProcess child2 out child2 = do @@ -59,7 +59,7 @@ daemonize logfd pidfile changedirectory a = do foreground :: Fd -> Maybe FilePath -> IO () -> IO () foreground logfd pidfile a = do maybe noop lockPidFile pidfile - _ <- createSession + _ <- tryIO createSession redirLog logfd a exitImmediately ExitSuccess diff --git a/debian/changelog b/debian/changelog index f0088cb2aa..7749953c1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (5.20140607) UNRELEASED; urgency=medium + + * Ignore setsid failures. + + -- Joey Hess Mon, 09 Jun 2014 14:44:09 -0400 + git-annex (5.20140606) unstable; urgency=medium * webapp: When adding a new local repository, fix bug that caused its diff --git a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__.mdwn b/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__.mdwn index 72499ffa34..279ca3a3bf 100644 --- a/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__.mdwn +++ b/doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__.mdwn @@ -29,3 +29,5 @@ WebApp crashed: createSession: permission denied (Operation not permitted) $ # End of transcript or log. """]] + +> provisionally fixed; [[done]] --[[Joey]]