From 170f847e74e7909ef601e8245d0ed1bada9a2e2d Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 11 Jan 2016 02:08:58 +0100 Subject: [PATCH] unset LD_LIBRARY_PATH before invoking ssh, hopefully fixes #514 --- borg/remote.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/borg/remote.py b/borg/remote.py index 1fcd97c50..0c572cd97 100644 --- a/borg/remote.py +++ b/borg/remote.py @@ -141,9 +141,13 @@ class RemoteRepository: self.p = None testing = location.host == '__testsuite__' borg_cmd = self.borg_cmd(args, testing) + env = dict(os.environ) if not testing: borg_cmd = self.ssh_cmd(location) + borg_cmd - self.p = Popen(borg_cmd, bufsize=0, stdin=PIPE, stdout=PIPE, stderr=PIPE) + # pyinstaller binary adds LD_LIBRARY_PATH=/tmp/_ME... but we do not want + # that the system's ssh binary picks up (non-matching) libraries from there + env.pop('LD_LIBRARY_PATH', None) + self.p = Popen(borg_cmd, bufsize=0, stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env) self.stdin_fd = self.p.stdin.fileno() self.stdout_fd = self.p.stdout.fileno() self.stderr_fd = self.p.stderr.fileno()