summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-12-13 11:03:06 -0600
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2023-12-13 19:28:49 +0000
commit265cdc4cebc5818c2387bf4f803a9fd2be416928 (patch)
tree2131e76e970deac012d9838fb12a8c0aaf69c70e
parent000d0a384f99cf71056c4639cbbc3be6bb2cf425 (diff)
downloadvyos-1x-265cdc4cebc5818c2387bf4f803a9fd2be416928.tar.gz
vyos-1x-265cdc4cebc5818c2387bf4f803a9fd2be416928.zip
T5774: fix regressions in remote.upload and use in config_mgmt
(cherry picked from commit 6b325962a4b8b3e67d7976bf161aed34a9fe6cce)
-rw-r--r--python/vyos/config_mgmt.py11
-rw-r--r--python/vyos/remote.py2
2 files changed, 3 insertions, 10 deletions
diff --git a/python/vyos/config_mgmt.py b/python/vyos/config_mgmt.py
index fd0fa7a75..e57129ce5 100644
--- a/python/vyos/config_mgmt.py
+++ b/python/vyos/config_mgmt.py
@@ -386,15 +386,8 @@ Proceed ?'''
_, _, netloc = url.netloc.rpartition("@")
redacted_location = urlunsplit(url._replace(netloc=netloc))
print(f" {redacted_location}", end=" ", flush=True)
- try:
- upload(archive_config_file, f'{location}/{remote_file}',
- source_host=source_address, raise_error=True)
- print("OK")
- except Exception as e:
- print("FAILED!")
- print()
- print(indent(str(e), " > "))
- print()
+ upload(archive_config_file, f'{location}/{remote_file}',
+ source_host=source_address)
# op-mode functions
#
diff --git a/python/vyos/remote.py b/python/vyos/remote.py
index 8928cce67..f86d2ef35 100644
--- a/python/vyos/remote.py
+++ b/python/vyos/remote.py
@@ -450,7 +450,7 @@ def upload(local_path, urlstring, progressbar=False,
source_host='', source_port=0, timeout=10.0):
try:
progressbar = progressbar and is_interactive()
- urlc(urlstring, progressbar, source_host, source_port, timeout).upload(local_path)
+ urlc(urlstring, progressbar, False, source_host, source_port, timeout).upload(local_path)
except Exception as err:
print_error(f'Unable to upload "{urlstring}": {err}')
except KeyboardInterrupt: