diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2018-03-26 21:20:09 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2018-03-26 21:20:09 +0000 |
| commit | 23edd6b9a4cca74cada39bffa9d71e2428689b67 (patch) | |
| tree | 38a74f09523a1cdd8f995beada1ddabdf5c1eca7 | |
| parent | 08103d563a9a85b0eec1c98824788cea9dd0ed8e (diff) | |
| download | s6-23edd6b9a4cca74cada39bffa9d71e2428689b67.tar.xz | |
Bugfix: inverted warning condition on s6_dtally_write (non-critical)
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | doc/upgrade.html | 6 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/supervision/s6-supervise.c | 2 |
5 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,11 @@ Changelog for s6. +In 2.7.1.1 +---------- + + - Bugfixes. + + In 2.7.1.0 ---------- diff --git a/doc/index.html b/doc/index.html index bae4da6..eeeac64 100644 --- a/doc/index.html +++ b/doc/index.html @@ -100,7 +100,7 @@ library. </li> <h3> Download </h3> <ul> - <li> The current released version of s6 is <a href="s6-2.7.1.0.tar.gz">2.7.1.0</a>. </li> + <li> The current released version of s6 is <a href="s6-2.7.1.1.tar.gz">2.7.1.1</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6 git repository</a>: diff --git a/doc/upgrade.html b/doc/upgrade.html index c57156d..3e2a538 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,12 @@ <h1> What has changed in s6 </h1> +<h2> in 2.7.1.1 </h2> + +<ul> + <li> No functional changes. </li> +</ul> + <h2> in 2.7.1.0 </h2> <ul> diff --git a/package/info b/package/info index 76c50e3..7f8c4ef 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6 -version=2.7.1.0 +version=2.7.1.1 category=admin package_macro_name=S6 diff --git a/src/supervision/s6-supervise.c b/src/supervision/s6-supervise.c index 4696004..9d821bd 100644 --- a/src/supervision/s6-supervise.c +++ b/src/supervision/s6-supervise.c @@ -355,7 +355,7 @@ static int uplastup_z (void) tab[m].stamp = status.stamp ; tab[m].sig = WIFSIGNALED(status.wstat) ? WTERMSIG(status.wstat) : 0 ; tab[m].exitcode = WIFSIGNALED(status.wstat) ? 128 + WTERMSIG(status.wstat) : WEXITSTATUS(status.wstat) ; - if (m >= n ? s6_dtally_write(".", tab+1, n) : s6_dtally_write(".", tab, m+1)) + if (!(m >= n ? s6_dtally_write(".", tab+1, n) : s6_dtally_write(".", tab, m+1))) strerr_warnwu2sys("write ", S6_DTALLY_FILENAME) ; } } |