branch: externals/gnu-elpa-keyring-update
commit 1e8726c459258fba62ee38807abdae4e350e5238
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
(gnu-elpa-keyring-update): Install the new keys even into empty keyring
---
gnu-elpa-keyring-update.el | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/gnu-elpa-keyring-update.el b/gnu-elpa-keyring-update.el
index 758ae1ab1a..7ed604d9e5 100644
--- a/gnu-elpa-keyring-update.el
+++ b/gnu-elpa-keyring-update.el
@@ -1,11 +1,11 @@
;;; gnu-elpa-keyring-update.el --- Update Emacs's GPG keyring for GNU ELPA
-*- lexical-binding: t; -*-
-;; Copyright (C) 2019-2022 Free Software Foundation, Inc.
+;; Copyright (C) 2019-2024 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monn...@iro.umontreal.ca>
;; Keywords: maint, tools
;; Package-Type: multi
-;; Version: 2022.12
+;; Version: 2022.12.1
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -36,6 +36,14 @@
;; temporarily disable signature verification (see variable
;; `package-check-signature') :-(
+;;; News:
+
+;; Since 2022.12:
+;; - Fix a bug where the new keys could end up remaining non-installed.
+;;
+;; Since 2019.3:
+;; - New GPG keys
+
;;; Code:
;;;###autoload
@@ -71,11 +79,9 @@
(let ((gnupghome-dir (or (bound-and-true-p package-gnupghome-dir)
(expand-file-name "gnupg"
package-user-dir))))
- (if (not (file-directory-p gnupghome-dir))
- (error "No keyring to update!")
- (package-import-keyring (gnu-elpa-keyring-update--keyring))
- (write-region "" nil (expand-file-name "gnu-elpa.timestamp"
gnupghome-dir)
- nil 'silent))))
+ (package-import-keyring (gnu-elpa-keyring-update--keyring))
+ (write-region "" nil (expand-file-name "gnu-elpa.timestamp" gnupghome-dir)
+ nil 'silent)))
;; FIXME: Maybe we should use an advice on `package--check-signature'
;; so as to avoid this startup cost?
