kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

reconfigure: Correctly re-throw SRFI-34 exceptions on Guile 3.

Browse Source 
Previously, we'd just print an ugly backtrace when running on Guile 3
because the '%exception throw would not be caught anywhere.

Reported by Arne Babenhauserheide <arne_bab@web.de>
in <https://bugs.gnu.org/40496>.

* guix/scripts/system/reconfigure.scm (install-bootloader-program): In
'catch' handler, match '%exception and use 'raise-exception' instead of
'throw' to rethrow in that case.
This commit is contained in:
Ludovic Courtès 2020-04-07 23:31:41 +02:00
parent 1c86577d62
commit 93add9bf7d
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/scripts/system/reconfigure.scm
View File

@ -211,6 +211,7 @@ BOOTLOADER-PACKAGE."
(guix store)
(guix utils)
(ice-9 binary-ports)
(ice-9 match)
(srfi srfi-34)
(srfi srfi-35))
@ -235,7 +236,11 @@ BOOTLOADER-PACKAGE."
(#$installer #$bootloader-package #$device #$target))
(lambda args
(delete-file new-gc-root)
(apply throw args))))
(match args
(('%exception exception) ;Guile 3 SRFI-34 or similar
(raise-exception exception))
((key . args)
(apply throw key args))))))
;; We are sure that the installation of the bootloader
;; succeeded, so we can replace the old GC root by the new
;; GC root now.