diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-06-09 14:44:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-09 14:44:18 -0400 |
| commit | 7f8c59418442bc0224b1b88f49e75458d190a64f (patch) | |
| tree | 3c52c63ac4f816d751d8c5cf56098b7e90b255bb | |
| parent | b29694b2e61d5f0ca36a3709eb7f76fdf3a739a5 (diff) | |
Ignore setsid failures.
| -rw-r--r-- | Utility/Daemon.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/bugs/git-annex:_createSession:_permission_denied___40__Operation_not_permitted__41__.mdwn | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/Utility/Daemon.hs b/Utility/Daemon.hs index 39c42bf53..23d18d2b6 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 f0088cb2a..7749953c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (5.20140607) UNRELEASED; urgency=medium + + * Ignore setsid failures. + + -- Joey Hess <joeyh@debian.org> 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 72499ffa3..279ca3a3b 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]] |