diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-13 18:26:15 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-13 18:26:15 -0700 |
| commit | c8109d9c4057d8cac79e2c139758cadd410e7446 (patch) | |
| tree | 6f410fc09e2f11cbb652344757a6c73a376c4216 /lisp/emacs-lisp | |
| parent | 36906806ccfc0e53f1d8c365ab0d7151288b7833 (diff) | |
| parent | 6de0715f5467d4b925e2dfe082174529ace3b174 (diff) | |
| download | emacs-c8109d9c4057d8cac79e2c139758cadd410e7446.tar.gz | |
Merge from origin/emacs-25
6de0715 Properly reject malformed or empty package sigs
edae7d9 Remove buggy non-native image scrolling
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index fea184d6242..8afe18f8d94 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1218,7 +1218,7 @@ errors." (unless (and (eq package-check-signature 'allow-unsigned) (eq (epg-signature-status sig) 'no-pubkey)) (setq had-fatal-error t)))) - (when (and (null good-signatures) had-fatal-error) + (when (or (null good-signatures) had-fatal-error) (package--display-verify-error context sig-file) (signal 'bad-signature (list sig-file))) good-signatures))) |