From eb8842c536af0d94146375b19800b15a03d81ee2 Mon Sep 17 00:00:00 2001 From: Yun Zheng Hu Date: Thu, 16 Nov 2023 22:08:44 +0000 Subject: [PATCH] T2405: resolve conflicts in remote.py --- python/vyos/remote.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python/vyos/remote.py b/python/vyos/remote.py index 8be0984983..77def7ed52 100644 --- a/python/vyos/remote.py +++ b/python/vyos/remote.py @@ -436,7 +436,8 @@ def urlc(urlstring, *args, **kwargs): except KeyError: raise ValueError(f'Unsupported URL scheme: "{scheme}"') -def download(local_path, urlstring, raise_error=False, *args, **kwargs): +def download(local_path, urlstring, progressbar=False, raise_error=False, check_space=False, + source_host='', source_port=0, timeout=10.0): try: urlc(urlstring, *args, **kwargs).download(local_path) except Exception as err: @@ -444,7 +445,8 @@ def download(local_path, urlstring, raise_error=False, *args, **kwargs): raise print_error(f'Unable to download "{urlstring}": {err}') -def upload(local_path, urlstring, raise_error=False, *args, **kwargs): +def upload(local_path, urlstring, progressbar=False, raise_error=False, + source_host='', source_port=0, timeout=10.0): try: urlc(urlstring, *args, **kwargs).upload(local_path) except Exception as err: