[Emacs-diffs] emacs-24 r117296: * lisp/emacs-lisp/package.el (package-list-unsigned): New var.

[Stefan Monnier]

------------------------------------------------------------
revno: 117296
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17625
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-06-25 13:20:08 -0400
message:
  * lisp/emacs-lisp/package.el (package-list-unsigned): New var.
  (package-desc-status): Obey it.
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-06-25 12:06:00 +0000
+++ b/lisp/ChangeLog    2014-06-25 17:20:08 +0000
@@ -1,3 +1,8 @@
+2014-06-25  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/package.el (package-list-unsigned): New var (bug#17625).
+       (package-desc-status): Obey it.
+
 2014-06-25  Stephen Berman  <address@hidden>
 
        * calendar/todo-mode.el: Fix two bugs.

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2014-06-05 07:08:42 +0000
+++ b/lisp/emacs-lisp/package.el        2014-06-25 17:20:08 +0000
@@ -823,6 +823,8 @@
                                    sig))
                              (epg-context-result-for context 'verify)))))
       (if (null good-signatures)
+          ;; FIXME: Only signal an error if the signature is invalid, not if we
+          ;; simply lack the key needed to check the sig!
           (error "Failed to verify signature %s: %S"
                  sig-file
                  (mapcar #'epg-signature-to-string
@@ -1651,6 +1653,9 @@
 (defvar package-list-unversioned nil
   "If non-nil include packages that don't have a version in `list-package'.")
 
+(defvar package-list-unsigned nil
+  "If non-nil, mention in the list which packages were installed w/o 
signature.")
+
 (defun package-desc-status (pkg-desc)
   (let* ((name (package-desc-name pkg-desc))
          (dir (package-desc-dir pkg-desc))
@@ -1671,9 +1676,8 @@
      (dir                               ;One of the installed packages.
       (cond
        ((not (file-exists-p (package-desc-dir pkg-desc))) "deleted")
-       ((eq pkg-desc (cadr (assq name package-alist))) (if signed
-                                                          "installed"
-                                                        "unsigned"))
+       ((eq pkg-desc (cadr (assq name package-alist)))
+        (if (or (not package-list-unsigned) signed) "installed" "unsigned"))
        (t "obsolete")))
      (t
       (let* ((ins (cadr (assq name package-alist)))
@@ -1683,9 +1687,9 @@
           (if (memq name package-menu--new-package-list)
               "new" "available"))
          ((version-list-< version ins-v) "obsolete")
-         ((version-list-= version ins-v) (if signed
-                                            "installed"
-                                          "unsigned"))))))))
+         ((version-list-= version ins-v)
+          (if (or (not package-list-unsigned) signed)
+              "installed" "unsigned"))))))))
 
 (defun package-menu--refresh (&optional packages keywords)
   "Re-populate the `tabulated-list-entries'.