From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <t.lamprecht@proxmox.com>
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 B3D9A724F0
 for <pve-devel@lists.proxmox.com>; Tue, 15 Jun 2021 16:24:18 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 9ACAF2FB0A
 for <pve-devel@lists.proxmox.com>; Tue, 15 Jun 2021 16:23:48 +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 70BFA2FAFA
 for <pve-devel@lists.proxmox.com>; Tue, 15 Jun 2021 16:23:47 +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 4317243FE7
 for <pve-devel@lists.proxmox.com>; Tue, 15 Jun 2021 16:23:47 +0200 (CEST)
Message-ID: <7d42279c-2ca1-84d6-5256-e0aae41f47c4@proxmox.com>
Date: Tue, 15 Jun 2021 16:23:41 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:90.0) Gecko/20100101
 Thunderbird/90.0
Content-Language: en-US
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
 Lorenz Stechauner <l.stechauner@proxmox.com>
References: <20210615140841.117933-1-l.stechauner@proxmox.com>
 <20210615140841.117933-3-l.stechauner@proxmox.com>
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
In-Reply-To: <20210615140841.117933-3-l.stechauner@proxmox.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results:  0
 AWL 1.150 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
 NICE_REPLY_A           -0.489 Looks like a legit reply (A)
 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: Re: [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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 15 Jun 2021 14:24:18 -0000

On 15.06.21 16:08, Lorenz Stechauner wrote:
> 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";

this was done by design, as there's a ".." before that

>  		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";

ok, slightly nicer

>  	    }
>  	}
>  
> @@ -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";

as above, the previous print has a ".." at the end so I left any whitespace out.

>  	    } else {
> -		die "ERROR, checksum mismatch: got '$checksum_got' != expect '$checksum_expected'\n";
> +		print "\n";

If, we could just include the "\n" in the start of the die, but we do not really
add such newlines for separating errors in general in task logs, so I'd rather
leave this one out.

> +		die "checksum mismatch: got '$checksum_got' != expect '$checksum_expected'\n";



>  	    }
>  	}
>  
>