Skip to content

Commit fd91242

Browse files
committed
Fix perform_rclone_check.
1 parent 60b30be commit fd91242

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

datashuttle/utils/rclone.py

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -774,15 +774,26 @@ def perform_rclone_check(
774774
"central", top_level_folder
775775
).parent.as_posix()
776776

777-
output = call_rclone_for_central_connection(
778-
cfg,
779-
f"{rclone_args('check')} "
780-
f'"{local_filepath}" '
781-
f'"{cfg.rclone.get_rclone_config_name()}:{central_filepath}"'
782-
f"{get_config_arg(cfg)} "
783-
f"--combined -",
784-
pipe_std=True,
785-
)
777+
if rclone_encryption.connection_method_requires_encryption(
778+
cfg["connection_method"]
779+
):
780+
output = call_rclone_for_central_connection(
781+
cfg,
782+
f"{rclone_args('check')} "
783+
f'"{local_filepath}" '
784+
f'"{cfg.rclone.get_rclone_config_name()}:{central_filepath}" '
785+
f"--combined - "
786+
f"{get_config_arg(cfg)}",
787+
pipe_std=True,
788+
)
789+
else:
790+
output = call_rclone(
791+
f"{rclone_args('check')} "
792+
f'"{local_filepath}" '
793+
f'"{cfg.rclone.get_rclone_config_name()}:{central_filepath}" '
794+
f"--combined - ",
795+
pipe_std=True,
796+
)
786797

787798
return output.stdout.decode("utf-8")
788799

0 commit comments

Comments
 (0)