Commit bb6aba9c authored by Michael Albinus's avatar Michael Albinus
Browse files

* net/tramp.el (tramp-handle-make-symbolic-link): Flush file

properties.
(tramp-handle-process-file): Call the program in a subshell, in
order to preserve working directory.
(tramp-action-password): Hide password prompt before next run.
(tramp-process-actions): Widen connection buffer for the trace.
parent 573d150b
2010-08-17 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-handle-make-symbolic-link): Flush file
properties.
(tramp-handle-process-file): Call the program in a subshell, in
order to preserve working directory.
(tramp-action-password): Hide password prompt before next run.
(tramp-process-actions): Widen connection buffer for the trace.
2010-08-16 Deniz Dogan <deniz.a.m.dogan@gmail.com> 2010-08-16 Deniz Dogan <deniz.a.m.dogan@gmail.com>
   
* net/rcirc.el (rcirc-log-process-buffers): New option. * net/rcirc.el (rcirc-log-process-buffers): New option.
......
...@@ -2552,7 +2552,7 @@ target of the symlink differ." ...@@ -2552,7 +2552,7 @@ target of the symlink differ."
(unless ln (unless ln
(tramp-error (tramp-error
l 'file-error l 'file-error
"Making a symbolic link. ln(1) does not exist on the remote host.")) "Making a symbolic link. ln(1) does not exist on the remote host."))
;; Do the 'confirm if exists' thing. ;; Do the 'confirm if exists' thing.
(when (file-exists-p linkname) (when (file-exists-p linkname)
...@@ -2573,6 +2573,9 @@ target of the symlink differ." ...@@ -2573,6 +2573,9 @@ target of the symlink differ."
(tramp-file-name-localname (tramp-file-name-localname
(tramp-dissect-file-name (expand-file-name filename))))) (tramp-dissect-file-name (expand-file-name filename)))))
(tramp-flush-file-property l (file-name-directory l-localname))
(tramp-flush-file-property l l-localname)
;; Right, they are on the same host, regardless of user, method, etc. ;; Right, they are on the same host, regardless of user, method, etc.
;; We now make the link on the remote machine. This will occur as the user ;; We now make the link on the remote machine. This will occur as the user
;; that FILENAME belongs to. ;; that FILENAME belongs to.
...@@ -4638,7 +4641,9 @@ beginning of local filename are not substituted." ...@@ -4638,7 +4641,9 @@ beginning of local filename are not substituted."
(setq outbuf (current-buffer)))) (setq outbuf (current-buffer))))
(when stderr (setq command (format "%s 2>%s" command stderr))) (when stderr (setq command (format "%s 2>%s" command stderr)))
;; Send the command. It might not return in time, so we protect it. ;; Send the command. It might not return in time, so we protect
;; it. Call it in a subshell, in order to preserve working
;; directory.
(condition-case nil (condition-case nil
(unwind-protect (unwind-protect
(setq ret (setq ret
...@@ -4646,7 +4651,7 @@ beginning of local filename are not substituted." ...@@ -4646,7 +4651,7 @@ beginning of local filename are not substituted."
v (format "\\cd %s; %s" v (format "\\cd %s; %s"
(tramp-shell-quote-argument localname) (tramp-shell-quote-argument localname)
command) command)
nil t)) t t))
;; We should show the output anyway. ;; We should show the output anyway.
(when outbuf (when outbuf
(with-current-buffer outbuf (with-current-buffer outbuf
...@@ -6698,8 +6703,10 @@ file exists and nonzero exit status otherwise." ...@@ -6698,8 +6703,10 @@ file exists and nonzero exit status otherwise."
"Query the user for a password." "Query the user for a password."
(with-current-buffer (process-buffer proc) (with-current-buffer (process-buffer proc)
(tramp-check-for-regexp proc tramp-password-prompt-regexp) (tramp-check-for-regexp proc tramp-password-prompt-regexp)
(tramp-message vec 3 "Sending %s" (match-string 1))) (tramp-message vec 3 "Sending %s" (match-string 1))
(tramp-enter-password proc)) (tramp-enter-password proc)
;; Hide password prompt.
(narrow-to-region (point-max) (point-max))))
(defun tramp-action-succeed (proc vec) (defun tramp-action-succeed (proc vec)
"Signal success in finding shell prompt." "Signal success in finding shell prompt."
...@@ -6810,6 +6817,7 @@ The terminal type can be configured with `tramp-terminal-type'." ...@@ -6810,6 +6817,7 @@ The terminal type can be configured with `tramp-terminal-type'."
(tramp-process-one-action proc vec actions)) (tramp-process-one-action proc vec actions))
(tramp-process-one-action proc vec actions))))) (tramp-process-one-action proc vec actions)))))
(with-current-buffer (tramp-get-connection-buffer vec) (with-current-buffer (tramp-get-connection-buffer vec)
(widen)
(tramp-message vec 6 "\n%s" (buffer-string))) (tramp-message vec 6 "\n%s" (buffer-string)))
(unless (eq exit 'ok) (unless (eq exit 'ok)
(tramp-clear-passwd vec) (tramp-clear-passwd vec)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment