diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-02 11:13:05 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-02 11:13:05 -0400 |
| commit | d7f413b893012eb5c9c93cd724008c2c1faae56f (patch) | |
| tree | 4db7c6d5c96996c1f144165e03edb8c06fe0b7be /lisp/emacs-lisp | |
| parent | 8eb61e5261cebf6a566b1138562953350080156b (diff) | |
| parent | ef9bcf3b409648f36c5745e22d147f50a144524f (diff) | |
| download | emacs-d7f413b893012eb5c9c93cd724008c2c1faae56f.tar.gz emacs-d7f413b893012eb5c9c93cd724008c2c1faae56f.tar.bz2 emacs-d7f413b893012eb5c9c93cd724008c2c1faae56f.zip | |
Merge from emacs-24
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 4832673b95c..10944f81534 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -289,6 +289,8 @@ contrast, `package-user-dir' contains packages for personal use." :group 'package :version "24.1") +(defvar epg-gpg-program) + (defcustom package-check-signature (if (progn (require 'epg-config) (executable-find epg-gpg-program)) 'allow-unsigned) @@ -1299,7 +1301,8 @@ similar to an entry in `package-alist'. Save the cached copy to (setq file (expand-file-name file)) (let ((context (epg-make-context 'OpenPGP)) (homedir (expand-file-name "gnupg" package-user-dir))) - (make-directory homedir t) + (with-file-modes 448 + (make-directory homedir t)) (epg-context-set-home-directory context homedir) (message "Importing %s..." (file-name-nondirectory file)) (epg-import-keys-from-file context file) |