the front end expects the error message to be the first part of the
last line.
---
src/PVE/Tools.pm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index c90810c..c02c259 100644
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -1869,11 +1869,12 @@ sub download_file_from_url {
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";
+ print " OK, got correct file already, no need to download\n";
return;
} else {
+ print "\n";
# we could re-download, but may not be safe so just abort for
now..
- die "mismatch (got '$checksum_got' != expect
'$checksum_expected'), aborting\n";
+ die "checksum mismatch: got '$checksum_got' != expect
'$checksum_expected', aborting\n";
}
}
@@ -1906,9 +1907,10 @@ sub download_file_from_url {
my $checksum_got = get_file_hash($checksum_algorithm, $tmpdest);
if (lc($checksum_got) eq lc($checksum_expected)) {
- print "OK, checksum verified\n";
+ print " OK, checksum verified\n";
} else {
- die "ERROR, checksum mismatch: got '$checksum_got' != expect
'$checksum_expected'\n";
+ print "\n";
+ die "checksum mismatch: got '$checksum_got' != expect
'$checksum_expected'\n";
}
}
--
2.20.1
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
