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 8D92670A2B for ; Mon, 9 May 2022 09:58:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 83EA629B5B for ; Mon, 9 May 2022 09:58:34 +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 A9EC629B52 for ; Mon, 9 May 2022 09:58:32 +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 7ABDF431C0 for ; Mon, 9 May 2022 09:58:32 +0200 (CEST) Date: Mon, 09 May 2022 09:58:25 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20220506105938.66419-1-f.ebner@proxmox.com> In-Reply-To: <20220506105938.66419-1-f.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1652082742.69si0wheac.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.174 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH manager] vzdump: generate notes: initialize potentially undef values 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, 09 May 2022 07:58:34 -0000 On May 6, 2022 12:59 pm, Fabian Ebner wrote: > For VMs, $task->{hostname} might be undef and when running on a > stand-alone node, there is no cluster name. >=20 > Reported-by: Marco Gabriel > Signed-off-by: Fabian Ebner > --- > PVE/VZDump.pm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm > index edcab696..8f11c820 100644 > --- a/PVE/VZDump.pm > +++ b/PVE/VZDump.pm > @@ -74,8 +74,8 @@ my $generate_notes =3D sub { > my ($notes_template, $task) =3D @_; > =20 > my $info =3D { > - cluster =3D> PVE::Cluster::get_clinfo()->{cluster}->{name}, > - guestname =3D> $task->{hostname}, > + cluster =3D> PVE::Cluster::get_clinfo()->{cluster}->{name} // '', might make sense to either use '-' or 'Standalone node' as fallback=20 here? both variants would be easily parsable as 'not a cluster name' ;) depending on the exact template an empty variable resolution can read=20 quite weird/confusing. e.g. Cluster {cluster} {guestname} and a quick glance would imply we are on a cluster called like the guest=20 ;) > + guestname =3D> $task->{hostname} // "VM $task->{vmid}", # is always set= for CTs > node =3D> PVE::INotify::nodename(), > vmid =3D> $task->{vmid}, > }; > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20