From e5de16bb013ae0a28b8363af18281d5126d89705 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 24 Nov 2021 08:41:16 +0530 Subject: [PATCH] Use fid_abs prefix for absolute symlinks --- kittens/transfer/send.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kittens/transfer/send.py b/kittens/transfer/send.py index abf28a37b..b52357c62 100644 --- a/kittens/transfer/send.py +++ b/kittens/transfer/send.py @@ -209,7 +209,8 @@ def files_for_send(cli_opts: TransferCLIOptions, args: List[str]) -> Tuple[File, files.remove(f) continue f.symbolic_link_target = f'path:{link_dest}' - q = link_dest if os.path.isabs(link_dest) else os.path.join(os.path.dirname(f.local_path), link_dest) + is_abs = os.path.isabs(link_dest) + q = link_dest if is_abs else os.path.join(os.path.dirname(f.local_path), link_dest) try: st = os.stat(q) except OSError: @@ -220,7 +221,8 @@ def files_for_send(cli_opts: TransferCLIOptions, args: List[str]) -> Tuple[File, g = tuple(x for x in groups[fh] if os.path.samestat(st, x.stat_result)) if g: t = g[0] - f.symbolic_link_target = f'fid:{t.file_id}' + prefix = 'fid_abs' if is_abs else 'fid' + f.symbolic_link_target = f'{prefix}:{t.file_id}' return tuple(files)