Merge authors: James Hunt (jamesodhunt) Related merge proposals: https://code.launchpad.net/~jamesodhunt/upstart/bug-1188642/+merge/171526 proposed by: James Hunt (jamesodhunt) review: Approve - Dmitrijs Ledkovs (xnox) ------------------------------------------------------------ revno: 1488 [merge] committer: James Hunt <[email protected]> branch nick: upstart timestamp: Wed 2013-06-26 13:25:19 +0100 message: * Merged lp:~jamesodhunt/upstart/bug-1188642. modified: ChangeLog init/log.c
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'ChangeLog' --- ChangeLog 2013-06-26 09:15:41 +0000 +++ ChangeLog 2013-06-26 12:10:23 +0000 @@ -10,6 +10,9 @@ - Comments and formatting. - main(): Default to an appropriate bus. - signal_filter(): Display signal details when run with --debug. + * init/log.c: log_clear_unflushed(): Remove log->io assertions as the + state cannot be reliably determined when remote_closed is set + (LP: #1188642). 2013-06-24 James Hunt <[email protected]> === modified file 'init/log.c' --- init/log.c 2013-05-24 14:48:33 +0000 +++ init/log.c 2013-06-26 12:10:23 +0000 @@ -813,12 +813,6 @@ * exists. */ nih_assert (log->unflushed->len); - - /* Either the NihIo has been destroyed, or all - * its data has been moved to the unflushed - * buffer. - */ - nih_assert (! log->io || ! log->io->recv_buf->len); } else { /* Parent job itself has ended, but job spawned one or * more processes that are still running and
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
