diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-11-15 13:58:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-15 13:58:23 +0100 |
| commit | 4b6cf1a482c4ccadd18a7e0e4585569f51ed2860 (patch) | |
| tree | e3a29051b8c66af8dd32728596d1650f039941d2 | |
| parent | f49ceb98d0f368057cf068520104e216d01b1358 (diff) | |
| parent | c7d51404f968e599196c33c788a423f1919fe231 (diff) | |
| download | vyatta-op-4b6cf1a482c4ccadd18a7e0e4585569f51ed2860.tar.gz vyatta-op-4b6cf1a482c4ccadd18a7e0e4585569f51ed2860.zip | |
Merge pull request #83 from vyos/mergify/bp/sagitta/pr-82
remote: T5726: Replace the download procedure call (backport #82)
| -rwxr-xr-x | scripts/vyatta-image-tools.pl | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scripts/vyatta-image-tools.pl b/scripts/vyatta-image-tools.pl index 4866a96..d654a22 100755 --- a/scripts/vyatta-image-tools.pl +++ b/scripts/vyatta-image-tools.pl @@ -126,7 +126,9 @@ sub url_copy { } } } - friendly_download($from, $to); + print "Downloading...\n"; + download($from, $to); + print "Download complete.\n"; } exit 0; } @@ -213,12 +215,7 @@ sub upload { sub download { my ($from, $to) = @_; - system("python3 -c 'from vyos.remote import download; download(\"$to\", \"$from\")'"); -} - -sub friendly_download { - my ($from, $to) = @_; - system("python3 -c 'from vyos.remote import friendly_download; friendly_download(\"$to\", \"$from\")'"); + system("python3 -c 'from vyos.remote import download; download(\"$to\", \"$from\", progressbar=True, check_space=True)'"); } sub y_or_n { |