mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 22:41:06 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/emacs-lisp/package.el (package-refresh-contents):

Browse source 
Don't change the value of `package-check-signature'.
(package-check-signature): Use `epg-find-configuration'
instead of `executable-find'.
This commit is contained in:
Artur Malabarba 2016-05-18 16:31:07 -03:00
parent dadfc30dae
commit 421e3c4b2f
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lisp/emacs-lisp/package.el
View file

@ -301,10 +301,12 @@ contrast, `package-user-dir' contains packages for personal use."
:risky t :risky t
:version "24.1") :version "24.1")
(defvar epg-gpg-program) (declare-function epg-find-configuration "epg-config"
(protocol &optional force))
(defcustom package-check-signature (defcustom package-check-signature
(if (progn (require 'epg-config) (executable-find epg-gpg-program)) (if (and (require 'epg-config)
(epg-find-configuration 'OpenPGP))
'allow-unsigned) 'allow-unsigned)
"Non-nil means to check package signatures when installing. "Non-nil means to check package signatures when installing.
The value `allow-unsigned' means to still install a package even if The value `allow-unsigned' means to still install a package even if
@ -1461,8 +1463,6 @@ taken care of by `package-initialize'."
(defvar package--downloads-in-progress nil (defvar package--downloads-in-progress nil
"List of in-progress asynchronous downloads.") "List of in-progress asynchronous downloads.")
(declare-function epg-find-configuration "epg-config"
(protocol &optional force))
(declare-function epg-import-keys-from-file "epg" (context keys)) (declare-function epg-import-keys-from-file "epg" (context keys))
;;;###autoload ;;;###autoload
@ -1562,12 +1562,6 @@ downloads in the background."
(let ((default-keyring (expand-file-name "package-keyring.gpg" (let ((default-keyring (expand-file-name "package-keyring.gpg"
data-directory)) data-directory))
(inhibit-message async)) (inhibit-message async))
(if (get 'package-check-signature 'saved-value)
(when package-check-signature
(epg-find-configuration 'OpenPGP))
(setq package-check-signature
(if (epg-find-configuration 'OpenPGP)
'allow-unsigned)))
(when (and package-check-signature (file-exists-p default-keyring)) (when (and package-check-signature (file-exists-p default-keyring))
(condition-case-unless-debug error (condition-case-unless-debug error
(package-import-keyring default-keyring) (package-import-keyring default-keyring)