[Emacs-diffs] emacs-24 r117533: * package.el (package-import-keyring): Create gnupg directory private.

[Glenn Morris]

------------------------------------------------------------
revno: 117533
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-10-01 19:39:50 -0400
message:
  * package.el (package-import-keyring): Create gnupg directory private.
  See bug#17625#155.
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-10-01 00:41:51 +0000
+++ b/lisp/ChangeLog    2014-10-01 23:39:50 +0000
@@ -1,3 +1,8 @@
+2014-10-01  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/package.el (package-import-keyring):
+       Create gnupg directory private.  (Bug#17625#155)
+
 2014-10-01  Stefan Monnier  <address@hidden>
 
        * progmodes/python.el (python-shell-completion-get-completions):

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2014-09-27 16:25:53 +0000
+++ b/lisp/emacs-lisp/package.el        2014-10-01 23:39:50 +0000
@@ -1298,7 +1298,13 @@
   (setq file (expand-file-name file))
   (let ((context (epg-make-context 'OpenPGP))
        (homedir (expand-file-name "gnupg" package-user-dir)))
-    (make-directory homedir t)
+    ;; FIXME Use `with-file-modes' when merged to trunk.
+    (let ((umask (default-file-modes)))
+      (unwind-protect
+          (progn
+            (set-default-file-modes 448)
+            (make-directory homedir t))
+        (set-default-file-modes umask)))
     (epg-context-set-home-directory context homedir)
     (message "Importing %s..." (file-name-nondirectory file))
     (epg-import-keys-from-file context file)