From 3805cbdfe02244d6ece591acc642b67f6e57b109 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 6 Dec 2024 20:05:50 +0700 Subject: [PATCH] cross device errors with links --- xpra/net/ssh/agent.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xpra/net/ssh/agent.py b/xpra/net/ssh/agent.py index 738c7e38c9..8544ed0ed4 100644 --- a/xpra/net/ssh/agent.py +++ b/xpra/net/ssh/agent.py @@ -127,7 +127,7 @@ def setup_proxy_ssh_socket(cmdline:Iterable[str], auth_sock:str=os.environ.get(" try: os.symlink(auth_sock, agent_uuid_sockpath) except OSError as e: - log(f"os.link({auth_sock}, {agent_uuid_sockpath})", exc_info=True) + log(f"os.symlink({auth_sock}, {agent_uuid_sockpath})", exc_info=True) log.error("Error creating ssh agent socket symlink") log.estr(e) return "" @@ -157,9 +157,9 @@ def setup_client_ssh_agent_socket(uuid:str, ssh_auth_sock:str) -> str: if ssh_auth_sock and os.path.isabs(ssh_auth_sock) and os.path.exists(ssh_auth_sock) and is_socket(ssh_auth_sock): try: #ie: /run/user/1000/xpra/10/$UUID -> /tmp/ssh-XXXXvjt4hN/agent.766599 - os.link(ssh_auth_sock, sockpath, follow_symlinks=False) + os.symlink(ssh_auth_sock, sockpath, follow_symlinks=False) except OSError as e: - log(f"os.link({ssh_auth_sock}, {sockpath})", exc_info=True) + log(f"os.symlink({ssh_auth_sock}, {sockpath})", exc_info=True) log.error("Error setting up ssh agent socket symlink") log.estr(e) sockpath = ""