[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#22883: [PATCH 2/9] git-authenticate: 'authenticate-commits' takes a
From: |
Ludovic Courtès |
Subject: |
bug#22883: [PATCH 2/9] git-authenticate: 'authenticate-commits' takes a #:keyring parameter. |
Date: |
Mon, 8 Jun 2020 23:54:08 +0200 |
* guix/git-authenticate.scm (authenticate-commits): Add #:keyring
parameter.
---
guix/git-authenticate.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm
index 6d71228d72..4795ccf12a 100644
--- a/guix/git-authenticate.scm
+++ b/guix/git-authenticate.scm
@@ -248,13 +248,13 @@ an OpenPGP keyring."
#:key
(default-authorizations '())
(keyring-reference "keyring")
+ (keyring (load-keyring-from-reference
+ repository keyring-reference))
(report-progress (const #t)))
"Authenticate COMMITS, a list of commit objects, calling REPORT-PROGRESS for
each of them. Return an alist showing the number of occurrences of each key.
-The OpenPGP keyring is loaded from KEYRING-REFERENCE in REPOSITORY."
- (define keyring
- (load-keyring-from-reference repository keyring-reference))
-
+If KEYRING is omitted, the OpenPGP keyring is loaded from KEYRING-REFERENCE in
+REPOSITORY."
(fold (lambda (commit stats)
(report-progress)
(let ((signer (authenticate-commit repository commit keyring
--
2.26.2
- bug#22883: [PATCH 1/9] git-authenticate: Cache takes a key parameter., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 6/9] .guix-channel: Add 'keyring-reference'., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 4/9] channels: 'latest-channel-instance' authenticates Git checkouts., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 2/9] git-authenticate: 'authenticate-commits' takes a #:keyring parameter.,
Ludovic Courtès <=
- bug#22883: [PATCH 5/9] channels: Make 'validate-pull' call right after clone/pull., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 7/9] channels: Automatically add introduction for the official 'guix' channel., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 8/9] pull: Add '--disable-authentication'., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 3/9] tests: Move OpenPGP helpers to (guix tests gnupg)., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 9/9] DROP? channels: Add prehistorical authorizations to <channel-introduction>., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 1/9] git-authenticate: Cache takes a key parameter., Ludovic Courtès, 2020/06/08