From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <l.stechauner@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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 34B487290F
for <pve-devel@lists.proxmox.com>; Wed, 16 Jun 2021 10:46:22 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 266B5F79B
for <pve-devel@lists.proxmox.com>; Wed, 16 Jun 2021 10:46:22 +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) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 8E4F0F78F
for <pve-devel@lists.proxmox.com>; Wed, 16 Jun 2021 10:46:21 +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 5C57342D92
for <pve-devel@lists.proxmox.com>; Wed, 16 Jun 2021 10:46:15 +0200 (CEST)
To: Thomas Lamprecht <t.lamprecht@proxmox.com>,
Proxmox VE development discussion <pve-devel@lists.proxmox.com>
References: <20210615140841.117933-1-l.stechauner@proxmox.com>
<20210615140841.117933-3-l.stechauner@proxmox.com>
<7d42279c-2ca1-84d6-5256-e0aae41f47c4@proxmox.com>
From: Lorenz Stechauner <l.stechauner@proxmox.com>
Message-ID: <3ea39263-1b5a-04f1-99eb-a412200c17d3@proxmox.com>
Date: Wed, 16 Jun 2021 10:46:14 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
Thunderbird/78.11.0
MIME-Version: 1.0
In-Reply-To: <7d42279c-2ca1-84d6-5256-e0aae41f47c4@proxmox.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Content-Language: en-US
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.955 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.095 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: Wed, 16 Jun 2021 08:46:22 -0000
On 15.06.21 16:23, Thomas Lamprecht wrote:
> 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.
The new line at the beginning of die does not work either :(
calculating checksum of existing file...TASK ERROR: checksum mismatch:
got '73e74eef3d998d522f92295016d92fdc' != expect 'asdf', aborting
The new line was converted to an additional space and the message was
prefixed with "TASK ERROR: "
The only way I can come up with to make this work for the frontend, is
to use a print statement before the die...
>
>> + die "checksum mismatch: got '$checksum_got' != expect '$checksum_expected'\n";
>
>
>> }
>> }
>>
>>