From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v9 common 2/2] tools: download_file_from_url: move check for existing file outside eval
Date: Wed, 16 Jun 2021 11:35:58 +0200 [thread overview]
Message-ID: <20210616093604.33668-3-l.stechauner@proxmox.com> (raw)
In-Reply-To: <20210616093604.33668-1-l.stechauner@proxmox.com>
it is not necessary to include this block in the eval which when it
fails tries to unlink $tmpdest, because in the check for the existing
file $tmpdest is not used.
---
src/PVE/Tools.pm | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index 3cf7c4d..9046b4f 100644
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -1862,22 +1862,22 @@ sub download_file_from_url {
print "downloading $url to $dest\n";
- my $tmpdest = "$dest.tmp.$$";
- eval {
- if (-f $dest && $checksum_algorithm) {
- print "calculating checksum of existing file...";
- my $checksum_got = get_file_hash($checksum_algorithm, $dest);
+ if (-f $dest && $checksum_algorithm) {
+ print "calculating checksum of existing file...";
+ my $checksum_got = get_file_hash($checksum_algorithm, $dest);
- if (lc($checksum_got) eq lc($checksum_expected)) {
- print "OK, got correct file already, no need to download\n";
- return;
- } else {
- # we could re-download, but may not be safe so just abort for now..
- print "\n"; # the front end expects the error to reside at the last line without any noise
- die "checksum mismatch: got '$checksum_got' != expect '$checksum_expected', aborting\n";
- }
+ if (lc($checksum_got) eq lc($checksum_expected)) {
+ print "OK, got correct file already, no need to download\n";
+ return;
+ } else {
+ # we could re-download, but may not be safe so just abort for now..
+ print "\n"; # the front end expects the error to reside at the last line without any noise
+ die "checksum mismatch: got '$checksum_got' != expect '$checksum_expected', aborting\n";
}
+ }
+ my $tmpdest = "$dest.tmp.$$";
+ eval {
local $SIG{INT} = sub {
unlink $tmpdest or warn "could not cleanup temporary file: $!";
die "got interrupted by signal\n";
--
2.20.1
next prev parent reply other threads:[~2021-06-16 9:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 9:35 [pve-devel] [PATCH-SERIES v9 manager/common/storage] fix #1710: add download from url button Lorenz Stechauner
2021-06-16 9:35 ` [pve-devel] [PATCH v9 common 1/2] tools: download_file_from_url: adapt error messages to start at new line Lorenz Stechauner
2021-06-16 10:45 ` [pve-devel] applied: " Thomas Lamprecht
2021-06-16 9:35 ` Lorenz Stechauner [this message]
2021-06-16 10:46 ` [pve-devel] applied: [PATCH v9 common 2/2] tools: download_file_from_url: move check for existing file outside eval Thomas Lamprecht
2021-06-16 9:35 ` [pve-devel] [PATCH v9 storage 1/1] status: add download_url method Lorenz Stechauner
2021-06-21 7:29 ` Thomas Lamprecht
2021-06-16 9:36 ` [pve-devel] [PATCH v9 manager 1/5] api: nodes: add query_url_metadata method Lorenz Stechauner
2021-06-16 9:36 ` [pve-devel] [PATCH v9 manager 2/5] api: nodes: refactor aplinfo to use common download function Lorenz Stechauner
2021-06-18 16:39 ` Thomas Lamprecht
2021-06-18 16:58 ` [pve-devel] applied: " Thomas Lamprecht
2021-06-21 7:53 ` Lorenz Stechauner
2021-06-16 9:36 ` [pve-devel] [PATCH v9 manager 3/5] ui: add HashAlgorithmSelector Lorenz Stechauner
2021-06-21 9:26 ` [pve-devel] applied: " Thomas Lamprecht
2021-06-16 9:36 ` [pve-devel] [PATCH v9 manager 4/5] ui: Utils: change download task format Lorenz Stechauner
2021-06-16 9:36 ` [pve-devel] [PATCH v9 manager 5/5] fix #1710: ui: storage: add download from url button Lorenz Stechauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210616093604.33668-3-l.stechauner@proxmox.com \
--to=l.stechauner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal