summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-11-27 21:30:00 -0600
committerJohn Estabrook <jestabro@vyos.io>2023-12-16 20:37:10 -0600
commit1f7dc278fc73f710eb41446a56031dcc50bfa0af (patch)
treecd89db9286ca5d1fbd09d7db1772ef967ea395bf /python
parentaf81dafa28947f364409e347227a2ac1d0b6c53d (diff)
downloadvyos-1x-1f7dc278fc73f710eb41446a56031dcc50bfa0af.tar.gz
vyos-1x-1f7dc278fc73f710eb41446a56031dcc50bfa0af.zip
image-tools: T5751: restore arg raise_error for non-interactive use
(cherry picked from commit 35f69340ef189e27b380074bb687ad58f29e9433)
Diffstat (limited to 'python')
-rw-r--r--python/vyos/remote.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/python/vyos/remote.py b/python/vyos/remote.py
index f86d2ef35..b1efcd10b 100644
--- a/python/vyos/remote.py
+++ b/python/vyos/remote.py
@@ -437,11 +437,13 @@ def urlc(urlstring, *args, **kwargs):
raise ValueError(f'Unsupported URL scheme: "{scheme}"')
def download(local_path, urlstring, progressbar=False, check_space=False,
- source_host='', source_port=0, timeout=10.0):
+ source_host='', source_port=0, timeout=10.0, raise_error=False):
try:
progressbar = progressbar and is_interactive()
urlc(urlstring, progressbar, check_space, source_host, source_port, timeout).download(local_path)
except Exception as err:
+ if raise_error:
+ raise
print_error(f'Unable to download "{urlstring}": {err}')
except KeyboardInterrupt:
print_error('\nDownload aborted by user.')