diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2025-08-07 18:23:43 +0200 |
|---|---|---|
| committer | Nguyễn Gia Phong <cnx@loang.net> | 2026-04-10 14:45:04 +0900 |
| commit | 1617972225277705844c2e81ad0d36fd88693fc7 (patch) | |
| tree | bb1ab92f69dad942b1d97b98878de5c81346d399 /guix | |
| parent | d9c7933f8e7c29346a41355d26ac2abf318d097d (diff) | |
guix: git-authenticate: Migrate to (srfi srfi-71).
* guix/git-authenticate.scm (commit-signing-key):
Use srfi-71 instead of srfi-11 in case of multiple values.
Change-Id: I6a35880bc97385b4424b7218a757c226e044555c
Reviewed-by: Danny Milosavljevic <dannym@friendly-machines.com>
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/git-authenticate.scm | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index c20c2aae27..e5796123b9 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019-2022, 2025 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,9 +50,9 @@ #:select (mkdir-p)) #:use-module (guix progress) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (srfi srfi-71) #:use-module (rnrs bytevectors) #:use-module (rnrs io ports) #:use-module (ice-9 match) @@ -115,12 +116,10 @@ if the commit is unsigned, has an invalid signature, has a signature using one of the hash algorithms in DISALLOWED-HASH-ALGORITHMS, or if its signing key is not in KEYRING." - (let-values (((signature signed-data) - (catch 'git-error - (lambda () - (commit-extract-signature repo commit-id)) - (lambda _ - (values #f #f))))) + (let ((signature signed-data + (catch 'git-error + (lambda () (commit-extract-signature repo commit-id)) + (lambda _ (values #f #f))))) (unless signature (raise (make-compound-condition (condition (&unsigned-commit-error (commit commit-id))) @@ -139,9 +138,9 @@ which is not permitted") signature))))) (with-fluids ((%default-port-encoding "UTF-8")) - (let-values (((status data) - (verify-openpgp-signature signature keyring - (open-input-string signed-data)))) + (let ((status data + (verify-openpgp-signature + signature keyring (open-input-string signed-data)))) (match status ('bad-signature ;; There's a signature but it's invalid. |
