From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0E59572487 for ; Tue, 15 Jun 2021 16:09:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 002082F2CA for ; Tue, 15 Jun 2021 16:09:10 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C6BC32F28E for ; Tue, 15 Jun 2021 16:09:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A180744096 for ; Tue, 15 Jun 2021 16:09:08 +0200 (CEST) From: Lorenz Stechauner To: pve-devel@lists.proxmox.com Date: Tue, 15 Jun 2021 16:08:35 +0200 Message-Id: <20210615140841.117933-3-l.stechauner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210615140841.117933-1-l.stechauner@proxmox.com> References: <20210615140841.117933-1-l.stechauner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.979 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [tools.pm] Subject: [pve-devel] [PATCH v8 common 2/2] tools: download_file_from_url: adapt error messages to start at new line X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2021 14:09:10 -0000 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