summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-01-19 22:42:27 +0100
committerLudovic Courtès <ludo@gnu.org>2020-01-19 23:11:37 +0100
commitb782688d71f707a8a263abc69c2745d815c45ec7 (patch)
tree7cadf2c169c255632492c4aae24a1bdd83d54b08 /guix
parent358f66a004bc232aca1c51d04776a2ae0c1fbc9a (diff)
downloadpatches-b782688d71f707a8a263abc69c2745d815c45ec7.tar
patches-b782688d71f707a8a263abc69c2745d815c45ec7.tar.gz
syscalls: Pass the right 'throw' arguments in 'call-with-file-lock/no-wait'.
Reported by Matt Wette <matt.wette@gmail.com> in <https://bugs.gnu.org/39194>. * guix/build/syscalls.scm (call-with-file-lock/no-wait): When re-throwing, pass KEY in addition to ARGS.
Diffstat (limited to 'guix')
-rw-r--r--guix/build/syscalls.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 248d6761fc..ae79a9708f 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -1140,7 +1140,7 @@ exception if it's already taken."
;; at this point.
(if (= ENOSYS (system-error-errno (cons key args)))
#f
- (apply throw args)))
+ (apply throw key args)))
(_ (apply throw key args)))))))
(dynamic-wind
(lambda ()