[Emacs-diffs] emacs-24 r117519: * lisp/emacs-lisp/package.el (package-check-signature): Default to nil if

[Stefan Monnier]

------------------------------------------------------------
revno: 117519
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-09-27 12:25:53 -0400
message:
  * lisp/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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-18 12:06:17 +0000
+++ b/lisp/ChangeLog    2014-09-27 16:25:53 +0000
@@ -1,3 +1,10 @@
+2014-09-27  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * window.el (fit-window-to-buffer): When counting buffer width,

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2014-09-02 19:51:25 +0000
+++ b/lisp/emacs-lisp/package.el        2014-09-27 16:25:53 +0000
@@ -289,7 +289,9 @@
   :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.
@@ -1313,12 +1315,12 @@
     (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")