mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
* net/tramp.el (tramp-action-out-of-band): Read pending output.
(tramp-call-process): Trace also DESTINATION. * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Quote file names when they are local. Remove superfluous trace.
This commit is contained in:
parent
218feefcc0
commit
8273986b5a
3 changed files with 18 additions and 5 deletions
|
|
@ -3468,6 +3468,8 @@ The terminal type can be configured with `tramp-terminal-type'."
|
|||
|
||||
(defun tramp-action-out-of-band (proc vec)
|
||||
"Check, whether an out-of-band copy has finished."
|
||||
;; There might be pending output for the exit status.
|
||||
(tramp-accept-process-output proc 0.1)
|
||||
(cond ((and (memq (process-status proc) '(stop exit))
|
||||
(zerop (process-exit-status proc)))
|
||||
(tramp-message vec 3 "Process has finished.")
|
||||
|
|
@ -4092,7 +4094,7 @@ Lisp error raised when PROGRAM is nil is trapped also, returning 1.
|
|||
Furthermore, traces are written with verbosity of 6."
|
||||
(tramp-message
|
||||
(vector tramp-current-method tramp-current-user tramp-current-host nil nil)
|
||||
6 "`%s %s' %s" program (mapconcat 'identity args " ") infile)
|
||||
6 "`%s %s' %s %s" program (mapconcat 'identity args " ") infile destination)
|
||||
(if (executable-find program)
|
||||
(apply 'call-process program infile destination display args)
|
||||
1))
|
||||
|
|
@ -4229,7 +4231,7 @@ T1 and T2 are time values (as returned by `current-time' for example)."
|
|||
;; This function should produce a string which is grokked by a Unix
|
||||
;; shell, even if the Emacs is running on Windows. Since this is the
|
||||
;; kludges section, we bind `system-type' in such a way that
|
||||
;; `shell-quote-arguments' behaves as if on Unix.
|
||||
;; `shell-quote-argument' behaves as if on Unix.
|
||||
;;
|
||||
;; Thanks to Mario DeWeerd for the hint that it is sufficient for this
|
||||
;; function to work with Bourne-like shells.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue