T2405: resolve conflicts in remote.py

vyos · Nov 16, 2023 · eb8842c · eb8842c
1 parent ac47a95
commit eb8842c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/python/vyos/remote.py b/python/vyos/remote.py
@@ -436,15 +436,17 @@ 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:
         if raise_error:
             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: