mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-31 20:02:42 +00:00
Code Issues Releases Activity

* lisp/emacs-lisp/package.el (package-check-signature): Default to nil if

Browse Source 
GPG is not available.
(package-refresh-contents): Don't mess with the keyring if we won't
check the signatures anyway.
This commit is contained in:
Stefan Monnier 2014-09-27 12:25:53 -04:00
parent af71540b12
commit a5426ef3c2
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -1,3 +1,10 @@
2014-09-27 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/package.el (package-check-signature): Default to nil if
GPG is not available.
(package-refresh-contents): Don't mess with the keyring if we won't
check the signatures anyway.
2014-09-18 Kan-Ru Chen <kanru@kanru.info> 2014-09-18 Kan-Ru Chen <kanru@kanru.info>
* window.el (fit-window-to-buffer): When counting buffer width, * window.el (fit-window-to-buffer): When counting buffer width,

16
lisp/emacs-lisp/package.el
View File

@ -289,7 +289,9 @@ contrast, `package-user-dir' contains packages for personal use."
:group 'package :group 'package
:version "24.1") :version "24.1")
(defcustom package-check-signature 'allow-unsigned (defcustom package-check-signature
(if (progn (require 'epg-config) (executable-find epg-gpg-program))
'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
it is unsigned. it is unsigned.
@ -1313,12 +1315,12 @@ makes them available for download."
(make-directory package-user-dir t)) (make-directory package-user-dir t))
(let ((default-keyring (expand-file-name "package-keyring.gpg" (let ((default-keyring (expand-file-name "package-keyring.gpg"
data-directory))) data-directory)))
(if (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
(progn (progn
(epg-check-configuration (epg-configuration)) (epg-check-configuration (epg-configuration))
(package-import-keyring default-keyring)) (package-import-keyring default-keyring))
(error (message "Cannot import default keyring: %S" (cdr error)))))) (error (message "Cannot import default keyring: %S" (cdr error))))))
(dolist (archive package-archives) (dolist (archive package-archives)
(condition-case-unless-debug nil (condition-case-unless-debug nil
(package--download-one-archive archive "archive-contents") (package--download-one-archive archive "archive-contents")