[elpa] externals/gnu-elpa-keyring-update b499616 3/7: gnu-elpa-keyring-update: Circumvent bug#35495

[Stefan Monnier]

branch: externals/gnu-elpa-keyring-update
commit b49961604cf6a0d8d81e635f08818caaf668a4b7
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    gnu-elpa-keyring-update: Circumvent bug#35495
    
    * etc/gnu-elpa.gpg-keyring: Rename from etc/gnu-elpa-keyring.gpg.
    * gnu-elpa-keyring-update.el (gnu-elpa-keyring-update--keyring):
    Update accordingly.
---
 etc/{gnu-elpa-keyring.gpg => gnu-elpa.gpg-keyring} | Bin
 gnu-elpa-keyring-update.el                         |   9 ++++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/etc/gnu-elpa-keyring.gpg b/etc/gnu-elpa.gpg-keyring
similarity index 100%
rename from etc/gnu-elpa-keyring.gpg
rename to etc/gnu-elpa.gpg-keyring
diff --git a/gnu-elpa-keyring-update.el b/gnu-elpa-keyring-update.el
index 3d1ea5d..4147cb8 100644
--- a/gnu-elpa-keyring-update.el
+++ b/gnu-elpa-keyring-update.el
@@ -43,11 +43,14 @@
 
 ;;;###autoload
 (defvar gnu-elpa-keyring-update--keyring
-  (let ((kr (expand-file-name "etc/gnu-elpa-keyring.gpg"
+  ;; FIXME: Avoid using a `.gpg' extension, because it triggers a bug in
+  ;; tar-untar-buffer (which is used internally by `package.el' when installing
+  ;; the package).
+  (let ((kr (expand-file-name "etc/gnu-elpa.gpg-keyring"
                               (file-name-directory load-file-name))))
     (if (and load-file-name (file-readable-p kr))
         kr
-      "etc/gnu-elpa-keyring.gpg")))
+      "etc/gnu-elpa.gpg-keyring")))
 
 (defun gnu-elpa-keyring-update--keyring (&optional noerror)
   (if (and (file-name-absolute-p gnu-elpa-keyring-update--keyring)
@@ -62,7 +65,7 @@
       (if (file-readable-p kr)
           (setq gnu-elpa-keyring-update--keyring kr)
         (unless noerror
-          (error "Can't find the keyring.gpg file with the new keys"))))))
+          (error "Can't find the gpg-keyring file with the new keys"))))))
 
 ;;;###autoload
 (defun gnu-elpa-keyring-update ()