diff options
| author | Michael Albinus | 2017-06-13 15:54:09 +0200 |
|---|---|---|
| committer | Michael Albinus | 2017-06-13 15:54:09 +0200 |
| commit | a63aeb64b70ba20cd1611bf97e435dd43a1c93f7 (patch) | |
| tree | f197d42b8a222dc025af6061d97306981e6a79f3 | |
| parent | 4e22083bf705285ca9c19949ed678defd6501998 (diff) | |
| download | emacs-a63aeb64b70ba20cd1611bf97e435dd43a1c93f7.tar.gz emacs-a63aeb64b70ba20cd1611bf97e435dd43a1c93f7.zip | |
* lisp/net/tramp-sh.el (tramp-set-file-uid-gid): Do not handle locally on w32.
| -rw-r--r-- | lisp/net/tramp-sh.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index f66dc7a7e22..f7b457ebf04 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -1543,9 +1543,8 @@ be non-negative integers." | |||
| 1543 | (tramp-shell-quote-argument localname)))))) | 1543 | (tramp-shell-quote-argument localname)))))) |
| 1544 | 1544 | ||
| 1545 | ;; We handle also the local part, because there doesn't exist | 1545 | ;; We handle also the local part, because there doesn't exist |
| 1546 | ;; `set-file-uid-gid'. On W32 "chown" might not work. We add a | 1546 | ;; `set-file-uid-gid'. On W32 "chown" does not work. |
| 1547 | ;; timeout for this. | 1547 | (unless (memq system-type '(ms-dos windows-nt)) |
| 1548 | (with-timeout (5 nil) | ||
| 1549 | (let ((uid (or (and (natnump uid) uid) (tramp-get-local-uid 'integer))) | 1548 | (let ((uid (or (and (natnump uid) uid) (tramp-get-local-uid 'integer))) |
| 1550 | (gid (or (and (natnump gid) gid) (tramp-get-local-gid 'integer)))) | 1549 | (gid (or (and (natnump gid) gid) (tramp-get-local-gid 'integer)))) |
| 1551 | (tramp-call-process | 1550 | (tramp-call-process |
| @@ -4426,7 +4425,8 @@ Goes through the list `tramp-inline-compress-commands'." | |||
| 4426 | (if (memq system-type '(windows-nt)) | 4425 | (if (memq system-type '(windows-nt)) |
| 4427 | "echo %s | \"%s\" | \"%s\"" | 4426 | "echo %s | \"%s\" | \"%s\"" |
| 4428 | "echo %s | %s | %s") | 4427 | "echo %s | %s | %s") |
| 4429 | magic compress decompress) nil nil)) | 4428 | magic compress decompress) |
| 4429 | nil nil)) | ||
| 4430 | (throw 'next nil)) | 4430 | (throw 'next nil)) |
| 4431 | (tramp-message | 4431 | (tramp-message |
| 4432 | vec 5 | 4432 | vec 5 |