Commit 457b0244 authored by Michael Albinus's avatar Michael Albinus

Another attempt to fix Bug#35769

* lisp/net/tramp.el (tramp-call-process, tramp-call-process-region)
(tramp-process-lines): Suppress `process-environment' entries
dedicated for remote processes.  (Bug#35769)
parent dc9f8c1c
Pipeline #1812 failed with stage
in 52 seconds
...@@ -4637,6 +4637,7 @@ It always returns a return code. The Lisp error raised when ...@@ -4637,6 +4637,7 @@ It always returns a return code. The Lisp error raised when
PROGRAM is nil is trapped also, returning 1. Furthermore, traces PROGRAM is nil is trapped also, returning 1. Furthermore, traces
are written with verbosity of 6." are written with verbosity of 6."
(let ((default-directory (tramp-compat-temporary-file-directory)) (let ((default-directory (tramp-compat-temporary-file-directory))
(process-environment (default-toplevel-value 'process-environment))
(destination (if (eq destination t) (current-buffer) destination)) (destination (if (eq destination t) (current-buffer) destination))
(vec (or vec (car tramp-current-connection))) (vec (or vec (car tramp-current-connection)))
output error result) output error result)
...@@ -4670,6 +4671,7 @@ It always returns a return code. The Lisp error raised when ...@@ -4670,6 +4671,7 @@ It always returns a return code. The Lisp error raised when
PROGRAM is nil is trapped also, returning 1. Furthermore, traces PROGRAM is nil is trapped also, returning 1. Furthermore, traces
are written with verbosity of 6." are written with verbosity of 6."
(let ((default-directory (tramp-compat-temporary-file-directory)) (let ((default-directory (tramp-compat-temporary-file-directory))
(process-environment (default-toplevel-value 'process-environment))
(buffer (if (eq buffer t) (current-buffer) buffer)) (buffer (if (eq buffer t) (current-buffer) buffer))
result) result)
(tramp-message (tramp-message
...@@ -4699,6 +4701,7 @@ are written with verbosity of 6." ...@@ -4699,6 +4701,7 @@ are written with verbosity of 6."
If an error occurs, it returns nil. Traces are written with If an error occurs, it returns nil. Traces are written with
verbosity of 6." verbosity of 6."
(let ((default-directory (tramp-compat-temporary-file-directory)) (let ((default-directory (tramp-compat-temporary-file-directory))
(process-environment (default-toplevel-value 'process-environment))
(vec (or vec (car tramp-current-connection))) (vec (or vec (car tramp-current-connection)))
result) result)
(if args (if args
......
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