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 274988C48 for ; Fri, 1 Sep 2023 10:13:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0822D12D57 for ; Fri, 1 Sep 2023 10:13:06 +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 for ; Fri, 1 Sep 2023 10:13:05 +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 45DF047CEA for ; Fri, 1 Sep 2023 10:13:05 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Fri, 1 Sep 2023 10:12:59 +0200 Message-Id: <20230901081259.30375-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.413 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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. [schema.rs] Subject: [pbs-devel] [PATCH proxmox] schema: removed excessive newlines in error messages X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Sep 2023 08:13:06 -0000 The output does not look good on console/task view when there is an empty line after the first error and trailing newlines after the last error. Removed the newlines. Example: before: ``` $ proxmox-backup-client ... Error: parameter verification errors parameter 'file-name': value does not match the regex pattern $ ``` now: ``` $ proxmox-backup-client ... Error: parameter verification errors parameter 'file-name': value does not match the regex pattern $ ``` Signed-off-by: Gabriel Goller --- proxmox-schema/src/schema.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxmox-schema/src/schema.rs b/proxmox-schema/src/schema.rs index f087706..596adee 100644 --- a/proxmox-schema/src/schema.rs +++ b/proxmox-schema/src/schema.rs @@ -101,14 +101,14 @@ impl fmt::Display for ParameterError { let mut msg = String::new(); if !self.is_empty() { - msg.push_str("parameter verification errors\n\n"); + msg.push_str("parameter verification errors\n"); } for (name, err) in self.error_list.iter() { let _ = writeln!(msg, "parameter '{}': {}", name, err); } - write!(f, "{}", msg) + write!(f, "{}", msg.trim()) } } -- 2.39.2