public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v8 common 2/2] tools: download_file_from_url: adapt error messages to start at new line
Date: Tue, 15 Jun 2021 16:08:35 +0200	[thread overview]
Message-ID: <20210615140841.117933-3-l.stechauner@proxmox.com> (raw)
In-Reply-To: <20210615140841.117933-1-l.stechauner@proxmox.com>

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





  parent reply	other threads:[~2021-06-15 14:09 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-15 14:08 [pve-devel] [PATCH-SERIES v8 manager/common/storage] fix #1710: add download from url button Lorenz Stechauner
2021-06-15 14:08 ` [pve-devel] [PATCH v8 common 1/2] tools: download_file_from_url: fix typo Lorenz Stechauner
2021-06-15 14:24   ` [pve-devel] applied: " Thomas Lamprecht
2021-06-15 14:08 ` Lorenz Stechauner [this message]
2021-06-15 14:23   ` [pve-devel] [PATCH v8 common 2/2] tools: download_file_from_url: adapt error messages to start at new line Thomas Lamprecht
2021-06-16  8:46     ` Lorenz Stechauner
2021-06-16  8:48       ` Thomas Lamprecht
2021-06-15 14:08 ` [pve-devel] [PATCH v8 storage 1/1] status: add download_url method Lorenz Stechauner
2021-06-15 14:08 ` [pve-devel] [PATCH v8 manager 1/5] api: nodes: add query_url_metadata method Lorenz Stechauner
2021-06-15 14:08 ` [pve-devel] [PATCH v8 manager 2/5] api: nodes: refactor aplinfo to use common download function Lorenz Stechauner
2021-06-15 14:08 ` [pve-devel] [PATCH v8 manager 3/5] ui: add HashAlgorithmSelector Lorenz Stechauner
2021-06-15 14:08 ` [pve-devel] [PATCH v8 manager 4/5] ui: Utils: change download task format Lorenz Stechauner
2021-06-15 14:08 ` [pve-devel] [PATCH v8 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=20210615140841.117933-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal