[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/07: syscalls: Pass the right 'throw' arguments in 'call-with-file-loc
From: |
guix-commits |
Subject: |
06/07: syscalls: Pass the right 'throw' arguments in 'call-with-file-lock/no-wait'. |
Date: |
Sun, 19 Jan 2020 17:12:13 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit b782688d71f707a8a263abc69c2745d815c45ec7
Author: Ludovic Courtès <address@hidden>
AuthorDate: Sun Jan 19 22:42:27 2020 +0100
syscalls: Pass the right 'throw' arguments in 'call-with-file-lock/no-wait'.
Reported by Matt Wette <address@hidden>
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.
---
guix/build/syscalls.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 248d676..ae79a97 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
<address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès
<address@hidden>
;;; Copyright © 2015 David Thompson <address@hidden>
;;; Copyright © 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
@@ -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 ()
- branch master updated (bed24ec -> 7842ddc), guix-commits, 2020/01/19
- 01/07: gnu: guile-commonmark: Add "guile3.0-commonmark" variant., guix-commits, 2020/01/19
- 02/07: tests: install: "raid-root-os" test uses RAID-1 instead of RAID-0., guix-commits, 2020/01/19
- 03/07: repl: Add "-q"., guix-commits, 2020/01/19
- 07/07: guix package: Create profiles/per-user/$USER upfront., guix-commits, 2020/01/19
- 04/07: repl: Adjust "--listen" help message., guix-commits, 2020/01/19
- 05/07: repl: Avoid dependency on high-level package modules., guix-commits, 2020/01/19
- 06/07: syscalls: Pass the right 'throw' arguments in 'call-with-file-lock/no-wait'.,
guix-commits <=