emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master a63aeb6: * lisp/net/tramp-sh.el (tramp-set-file-uid


From: Michael Albinus
Subject: [Emacs-diffs] master a63aeb6: * lisp/net/tramp-sh.el (tramp-set-file-uid-gid): Do not handle locally on w32.
Date: Tue, 13 Jun 2017 09:54:16 -0400 (EDT)

branch: master
commit a63aeb64b70ba20cd1611bf97e435dd43a1c93f7
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    * lisp/net/tramp-sh.el (tramp-set-file-uid-gid): Do not handle locally on 
w32.
---
 lisp/net/tramp-sh.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index f66dc7a..f7b457e 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1543,9 +1543,8 @@ be non-negative integers."
                  (tramp-shell-quote-argument localname))))))
 
       ;; We handle also the local part, because there doesn't exist
-      ;; `set-file-uid-gid'.  On W32 "chown" might not work.  We add a
-      ;; timeout for this.
-      (with-timeout (5 nil)
+      ;; `set-file-uid-gid'.  On W32 "chown" does not work.
+      (unless (memq system-type '(ms-dos windows-nt))
        (let ((uid (or (and (natnump uid) uid) (tramp-get-local-uid 'integer)))
              (gid (or (and (natnump gid) gid) (tramp-get-local-gid 'integer))))
          (tramp-call-process
@@ -4426,7 +4425,8 @@ Goes through the list `tramp-inline-compress-commands'."
                 (if (memq system-type '(windows-nt))
                     "echo %s | \"%s\" | \"%s\""
                   "echo %s | %s | %s")
-                magic compress decompress) nil nil))
+                magic compress decompress)
+               nil nil))
            (throw 'next nil))
          (tramp-message
           vec 5



reply via email to

[Prev in Thread] Current Thread [Next in Thread]