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

Merge from emacs-24

Browse source
This commit is contained in:
Stefan Monnier 2014-09-30 19:19:31 -04:00
commit 07bec0fc67
16 changed files with 387 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -289,7 +289,9 @@ contrast, `package-user-dir' contains packages for personal use."
:group 'package
: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.
The value `allow-unsigned' means to still install a package even if
it is unsigned.
@ -1314,12 +1316,12 @@ makes them available for download."
(make-directory package-user-dir t))
(let ((default-keyring (expand-file-name "package-keyring.gpg"
data-directory)))
(if (file-exists-p default-keyring)
(condition-case-unless-debug error
(progn
(epg-check-configuration (epg-configuration))
(package-import-keyring default-keyring))
(error (message "Cannot import default keyring: %S" (cdr error))))))
(when (and package-check-signature (file-exists-p default-keyring))
(condition-case-unless-debug error
(progn
(epg-check-configuration (epg-configuration))
(package-import-keyring default-keyring))
(error (message "Cannot import default keyring: %S" (cdr error))))))
(dolist (archive package-archives)
(condition-case-unless-debug nil
(package--download-one-archive archive "archive-contents")