tools: download_file_from_url: move check for existing file outside eval

[pve-common.git] / src / PVE / Tools.pm

diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index c90810ca764449a1365286db1a8f9ac6e79279f2..9046b4f2c4ef7953b60581024b1d3b1f4a42398a 100644 (file)
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -1862,21 +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..
-               die "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";
@@ -1908,7 +1909,8 @@ sub download_file_from_url {
            if (lc($checksum_got) eq lc($checksum_expected)) {
                print "OK, checksum verified\n";
            } else {
-               die "ERROR, checksum mismatch: got '$checksum_got' != expect '$checksum_expected'\n";
+               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'\n";
            }
        }