aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp.el11
2 files changed, 12 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5288be5ad8f..258a6361427 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-10-23 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp.el (tramp-set-file-uid-gid): Protect `call-process'
4 when we are local.
5
12007-10-23 Stefan Monnier <monnier@iro.umontreal.ca> 62007-10-23 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * progmodes/python.el (python-current-defun): Remove left-over 8 * progmodes/python.el (python-current-defun): Remove left-over
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 881fa6ceb5a..b54641b311e 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2575,11 +2575,14 @@ and gid of the corresponding user is taken. Both parameters must be integers."
2575 ;; We handle also the local part, because there doesn't exist 2575 ;; We handle also the local part, because there doesn't exist
2576 ;; `set-file-uid-gid'. 2576 ;; `set-file-uid-gid'.
2577 (let ((uid (or (and (integerp uid) uid) (tramp-get-local-uid 'integer))) 2577 (let ((uid (or (and (integerp uid) uid) (tramp-get-local-uid 'integer)))
2578 (gid (or (and (integerp gid) gid) (tramp-get-local-uid 'integer))) 2578 (gid (or (and (integerp gid) gid) (tramp-get-local-gid 'integer)))
2579 (default-directory (tramp-compat-temporary-file-directory))) 2579 (default-directory (tramp-compat-temporary-file-directory)))
2580 (call-process 2580 ;; "chown" might not exist, for example on Win32.
2581 "chown" nil nil nil 2581 (condition-case nil
2582 (format "%d:%d" uid gid) (tramp-shell-quote-argument filename))))) 2582 (call-process
2583 "chown" nil nil nil
2584 (format "%d:%d" uid gid) (tramp-shell-quote-argument filename))
2585 (error nil)))))
2583 2586
2584;; Simple functions using the `test' command. 2587;; Simple functions using the `test' command.
2585 2588