summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-06-08 11:52:15 +0200
committerLudovic Courtès <ludo@gnu.org>2020-06-16 16:10:46 +0200
commit41946b79f10d9b18e66c81f4eb35e1fde132c3ef (patch)
tree393598a7bd7139dc1edf6f51e612ce757a0fece9
parenta450b4343bc1e5284c4db6409976eba7bb92df19 (diff)
downloadguix-41946b79f10d9b18e66c81f4eb35e1fde132c3ef.tar.gz
git-authenticate: 'authenticate-commits' takes a #:keyring parameter.
* guix/git-authenticate.scm (authenticate-commits): Add #:keyring
parameter.
-rw-r--r--guix/git-authenticate.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm
index cdb54a01a7..228d551d11 100644
--- a/guix/git-authenticate.scm
+++ b/guix/git-authenticate.scm
@@ -271,13 +271,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