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 ED94869D9D for ; Mon, 16 Nov 2020 10:44:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DD3C82CAB8 for ; Mon, 16 Nov 2020 10:44:17 +0100 (CET) Received: from dev.dominic.proxmox.com (212-186-127-178.static.upcbusiness.at [212.186.127.178]) by firstgate.proxmox.com (Proxmox) with ESMTP id 746D62CAAE for ; Mon, 16 Nov 2020 10:44:17 +0100 (CET) Received: by dev.dominic.proxmox.com (Postfix, from userid 0) id 84AA8219D1; Mon, 16 Nov 2020 10:44:16 +0100 (CET) From: =?UTF-8?q?Dominic=20J=C3=A4ger?= To: pve-devel@lists.proxmox.com Date: Mon, 16 Nov 2020 10:44:11 +0100 Message-Id: <20201116094411.45477-1-d.jaeger@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.357 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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. [vzdump.pm] Subject: [pve-devel] [PATCH manager] vzdump mail: fix #3136: Add name to plain/text part 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: Mon, 16 Nov 2020 09:44:48 -0000 The html/text part already has VMID NAME STATUS TIME..., but the text part only had VMID STATUS TIME... so far. Therefore, add the missing "name" column. Limit the length of names so that the content of the following columns remains aligned to the headings. Note that (like before, too) this only works with monospaced fonts. Signed-off-by: Dominic Jäger --- Unfortunately, I had no idea for non-monospaced fonts yet. PVE/VZDump.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 517becb1..1096d594 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -258,18 +258,20 @@ sub sendmail { # text part my $text = $err ? "$err\n\n" : ''; - $text .= sprintf ("%-10s %-6s %10s %10s %s\n", qw(VMID STATUS TIME SIZE FILENAME)); + $text .= sprintf ("%-10s %-20s %-6s %10s %10s %s\n", qw(VMID NAME STATUS TIME SIZE FILENAME)); foreach my $task (@$tasklist) { my $vmid = $task->{vmid}; if ($task->{state} eq 'ok') { - $text .= sprintf ("%-10s %-6s %10s %10s %s\n", $vmid, + $text .= sprintf ("%-10s %-20s %-6s %10s %10s %s\n", $vmid, + substr($task->{hostname}, 0, 20), $task->{state}, format_time($task->{backuptime}), format_size ($task->{size}), $task->{target}); } else { - $text .= sprintf ("%-10s %-6s %10s %8.2fMB %s\n", $vmid, + $text .= sprintf ("%-10s %-20s %-6s %10s %8.2fMB %s\n", $vmid, + substr($task->{hostname}, 0, 20), $task->{state}, format_time($task->{backuptime}), 0, '-'); -- 2.20.1