summaryrefslogtreecommitdiff
path: root/guix/scripts
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-05-17 16:19:20 +0200
committerLudovic Courtès <ludo@gnu.org>2023-05-18 19:20:58 +0200
commitcd08d64b3a1d18cceba2fb7ec01c27b1c08f88d2 (patch)
tree9d48131c4c63df6d96eccdf072abae65fffd9271 /guix/scripts
parentfddf97456c473b1231e08aea5e8096f42f2a63a8 (diff)
refresh: Honor '--key-server'.
Previously, the '--key-server' option would be ignored in an invocation like: ./pre-inst-env guix refresh python-scipy=1.8.1 -t pypi -u \ --key-server=pgp.mit.edu * guix/upstream.scm (download-tarball): Add #:key-server parameter and pass it to 'gnupg-verify*'. (package-update/url-fetch, package-update/git-fetch) (package-update): Likewise. * guix/scripts/refresh.scm (update-package): Add #:key-server and pass it down to 'package-update'. (guix-refresh): Pass #:key-server to 'update-package'.
Diffstat (limited to 'guix/scripts')
-rw-r--r--guix/scripts/refresh.scm8
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index 47c4d55ec4..bfa6269aa3 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -348,7 +348,8 @@ update would trigger a complete rebuild."
(package-name package)))
(define* (update-package store package version updaters
- #:key (key-download 'interactive) warn?)
+ #:key (key-download 'interactive) key-server
+ warn?)
"Update the source file that defines PACKAGE with the new version.
KEY-DOWNLOAD specifies a download policy for missing OpenPGP keys; allowed
values: 'interactive' (default), 'always', and 'never'. When WARN? is true,
@@ -356,7 +357,9 @@ warn about packages that have no matching updater."
(if (lookup-updater package updaters)
(let ((version output source
(package-update store package updaters
- #:key-download key-download #:version version))
+ #:version version
+ #:key-download key-download
+ #:key-server key-server))
(loc (or (package-field-location package 'version)
(package-location package))))
(when version
@@ -628,6 +631,7 @@ all are dependent packages: ~{~a~^ ~}~%")
(update-spec-package update)
(update-spec-version update)
updaters
+ #:key-server (%openpgp-key-server)
#:key-download key-download
#:warn? warn?))
update-specs)