diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-06-25 23:55:15 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-06-25 23:55:15 -0700 |
| commit | 9ac6d28ab8c29547d9f9365dc8f7cea13c32ef7a (patch) | |
| tree | 026dc1d5a858b27086c4f9d8e0f4a60b7907eb80 /lisp/emacs-lisp/package.el | |
| parent | a0e2175a9055f2ea8ae03744d495e5179885029d (diff) | |
| parent | 436550da1bf8d2cdd92a60f6ce84f131a8045062 (diff) | |
| download | emacs-9ac6d28ab8c29547d9f9365dc8f7cea13c32ef7a.tar.gz emacs-9ac6d28ab8c29547d9f9365dc8f7cea13c32ef7a.tar.bz2 emacs-9ac6d28ab8c29547d9f9365dc8f7cea13c32ef7a.zip | |
Merge from emacs-24; up to 2014-06-11T19:33:14Z!rgm@gnu.org
Diffstat (limited to 'lisp/emacs-lisp/package.el')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 7ca62464bd0..c2aaabdd6a6 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -836,6 +836,8 @@ GnuPG keyring is located under \"gnupg\" in `package-user-dir'." 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 @@ -1664,6 +1666,9 @@ package PKG-DESC, add one. The alist is keyed with PKG-DESC." (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)) @@ -1684,9 +1689,8 @@ package PKG-DESC, add one. The alist is keyed with PKG-DESC." (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))) @@ -1696,9 +1700,9 @@ package PKG-DESC, add one. The alist is keyed with PKG-DESC." (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'. |