diff options
| author | Artur Malabarba <bruce.connor.am@gmail.com> | 2016-05-18 16:31:07 -0300 |
|---|---|---|
| committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2016-05-20 16:22:13 -0300 |
| commit | 421e3c4b2f14cfdf84a07095be1cbc76c9038da0 (patch) | |
| tree | 7fabb0a1d2db64be849f5674714a7faeb7f7c31f | |
| parent | dadfc30dae9529282a05720155d4aa1c5bd749b1 (diff) | |
| download | emacs-421e3c4.tar.gz | |
* lisp/emacs-lisp/package.el (package-refresh-contents):
Don't change the value of `package-check-signature'.
(package-check-signature): Use `epg-find-configuration'
instead of `executable-find'.
| -rw-r--r-- | lisp/emacs-lisp/package.el | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 8f309cb798f..b0a6db087ba 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -301,10 +301,12 @@ contrast, `package-user-dir' contains packages for personal use." :risky t :version "24.1") -(defvar epg-gpg-program) +(declare-function epg-find-configuration "epg-config" + (protocol &optional force)) (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) "Non-nil means to check package signatures when installing. 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 "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)) ;;;###autoload @@ -1562,12 +1562,6 @@ downloads in the background." (let ((default-keyring (expand-file-name "package-keyring.gpg" data-directory)) (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)) (condition-case-unless-debug error (package-import-keyring default-keyring) |