diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-02-24 19:37:03 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-24 19:37:03 +0100 |
commit | 3941af527df6f27c88258c5d3b78720a07fe60ef (patch) | |
tree | 4747f74f32faef8a4f20bf7adf797ce57a8324fc /gnu/build/marionette.scm | |
parent | d85f8e46dbc5a978fe7359c89cbb3167fb9c2029 (diff) | |
parent | 7daae3c9d09a4d27586824a1d1af99e7af454d26 (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/build/marionette.scm')
-rw-r--r-- | gnu/build/marionette.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index 1dbe385e89..fe754cd147 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -204,6 +204,7 @@ MARIONETTE. Raise an error on failure." (catch 'system-error (lambda () (connect sock AF_INET INADDR_LOOPBACK ,port) + (close-port sock) 'success) (lambda args (if (< i ,timeout) @@ -227,6 +228,7 @@ accept connections in MARIONETTE. Raise an error on failure." (catch 'system-error (lambda () (connect sock AF_UNIX ,file-name) + (close-port sock) 'success) (lambda args (if (< i ,timeout) @@ -315,8 +317,8 @@ PREDICATE, whichever comes first. Raise an error when TIMEOUT is exceeded." (#\( . "shift-9") (#\) . "shift-0") (#\/ . "slash") - (#\< . "less") - (#\> . "shift-less") + (#\< . "shift-comma") + (#\> . "shift-dot") (#\. . "dot") (#\, . "comma") (#\; . "semicolon") |