[gnus git] branch master updated: m0-11-5-gfa44e14 =1= gnus-fun.el (gnus-grab-cam-face): Do not use predictable temp-file name (http://bugs.debian.org/747100)
Katsumi Yamaoka <[email protected]> Thu, 08 May 2014 06:00:27 +0200
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via fa44e14d9b3db9b61236a6f1a68f3b5420e3e2ab (commit)
from cc02dd55f06a04a5398ad9387d02e4ee853a03a2 (commit)
- Log -----------------------------------------------------------------
commit fa44e14d9b3db9b61236a6f1a68f3b5420e3e2ab
Author: Glenn Morris <[email protected]>
Date: Thu May 8 04:00:19 2014 +0000
gnus-fun.el (gnus-grab-cam-face): Do not use predictable temp-file name (http://bugs.debian.org/747100)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 73e1411..5ae46de 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-08 Glenn Morris <[email protected]>
+
+ * gnus-fun.el (gnus-grab-cam-face):
+ Do not use predictable temp-file name. (http://bugs.debian.org/747100)
+
2014-05-04 Glenn Morris <[email protected]>
* gnus-registry.el (gnus-registry-install-p): Doc fix.
diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index d6b4fba..e0d1578 100644
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -301,20 +301,21 @@ colors of the displayed X-Faces."
(interactive)
(shell-command "xawtv-remote snap ppm")
(let ((file nil)
+ (tempfile (make-temp-file "gnus-face-" nil ".ppm"))
result)
(while (null (setq file (directory-files "/tftpboot/sparky/tmp"
t "snap.*ppm")))
(sleep-for 1))
(setq file (car file))
(shell-command
- (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale -width 48 -height 48 | ppmtopgm > /tmp/gnus.face.ppm"
- file))
+ (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale -width 48 -height 48 | ppmtopgm >> %s"
+ file tempfile))
(let ((gnus-convert-image-to-face-command
(format "cat '%%s' | ppmquant %%d | ppmchange %s | pnmtopng"
(gnus-fun-ppm-change-string))))
- (setq result (gnus-face-from-file "/tmp/gnus.face.ppm")))
+ (setq result (gnus-face-from-file tempfile)))
(delete-file file)
- ;;(delete-file "/tmp/gnus.face.ppm")
+ ;;(delete-file tempfile) ; FIXME why are we not deleting it?!
result))
(defun gnus-fun-ppm-change-string ()
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 5 +++++
lisp/gnus-fun.el | 9 +++++----
2 files changed, 10 insertions(+), 4 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project