diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-02-17 21:29:00 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-02-17 21:29:00 +0000 |
| commit | 79fe528287af73c7e1691c7c447972704eb7634b (patch) | |
| tree | 51981fa7fe44c8bd796cc47da2ece451899cbb3a | |
| parent | b11bacf27cd92528f4c2e157414c43b9cebd2b4d (diff) | |
| download | s6-79fe528287af73c7e1691c7c447972704eb7634b.tar.xz | |
Bugfix: s6-log wasn't parsing regexps correctly (!)
Thanks to Roy Lanek.
version: 2.1.1.1
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | doc/upgrade.html | 8 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/daemontools-extras/s6-log.c | 2 | ||||
| -rw-r--r-- | src/fdholder/s6-fdholderd.c | 2 |
6 files changed, 13 insertions, 4 deletions
@@ -18,3 +18,4 @@ Thanks to: Vallo Kallaste <kalts@estpak.ee> Patrick Mahoney <pat@polycrystal.org> Colin Booth <cathexis@gmail.com> + Roy Lanek <roy.lanek@gmail.com> diff --git a/doc/index.html b/doc/index.html index ab9a620..cad6220 100644 --- a/doc/index.html +++ b/doc/index.html @@ -99,7 +99,7 @@ library. </li> <h3> Download </h3> <ul> - <li> The current released version of s6 is <a href="s6-2.1.1.0.tar.gz">2.1.1.0</a>. </li> + <li> The current released version of s6 is <a href="s6-2.1.1.1.tar.gz">2.1.1.1</a>. </li> <li> Alternatively, you can checkout a copy of the s6 git repository: <pre> git clone git://git.skarnet.org/s6 </pre> </li> </ul> diff --git a/doc/upgrade.html b/doc/upgrade.html index 3a29aa6..95e6434 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -17,6 +17,14 @@ <h1> What has changed in s6 </h1> +<h2> in 2.1.1.1 </h2> + +<p> + Bugfix release, no important changes. +</p> + +<h2> in 2.1.1.0 </h2> + <ul> <li> skalibs dependency bumped to 2.3.0.0. </li> <li> execline dependency bumped to 2.0.2.1. </li> diff --git a/package/info b/package/info index c9c4e7f..6d33d12 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6 -version=2.1.1.0 +version=2.1.1.1 category=admin package_macro_name=S6 diff --git a/src/daemontools-extras/s6-log.c b/src/daemontools-extras/s6-log.c index 8a5afc0..3e1d0ce 100644 --- a/src/daemontools-extras/s6-log.c +++ b/src/daemontools-extras/s6-log.c @@ -808,7 +808,7 @@ static inline void script_secondpass (char const *const *argv, scriptelem_t *scr errno = ENOMEM ; strerr_diefu1sys(111, "initialize script") ; } - if (!r) goto fail ; + if (r) goto fail ; } selections[sel++] = selitem ; if (flagacted) diff --git a/src/fdholder/s6-fdholderd.c b/src/fdholder/s6-fdholderd.c index b9091d2..b5e80ec 100644 --- a/src/fdholder/s6-fdholderd.c +++ b/src/fdholder/s6-fdholderd.c @@ -800,6 +800,6 @@ int main (int argc, char const *const *argv, char const *const *envp) else client_add(&i, fd, &rre, &wre, flags) ; } } - return (!!numfds | (!!numconn << 1)) ; + return ((!!numfds) | (!!numconn << 1)) ; } } |