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 3C44662855; Tue, 24 Nov 2020 10:10:10 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3297E88D9; Tue, 24 Nov 2020 10:09:40 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 1AA14889D; Tue, 24 Nov 2020 10:09:38 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D8C474405B; Tue, 24 Nov 2020 10:09:37 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Tue, 24 Nov 2020 10:09:30 +0100 Message-Id: <20201124090936.21810-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201124090936.21810-1-d.csapak@proxmox.com> References: <20201124090936.21810-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.324 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [pbsplugin.pm, content.pm, plugin.pm] Subject: [pve-devel] [PATCH storage v2 1/4] rename comment to notes 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: Tue, 24 Nov 2020 09:10:10 -0000 so that we are more consistent with pbs Signed-off-by: Dominik Csapak --- PVE/API2/Storage/Content.pm | 4 ++-- PVE/Storage/PBSPlugin.pm | 2 +- PVE/Storage/Plugin.pm | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PVE/API2/Storage/Content.pm b/PVE/API2/Storage/Content.pm index 8d2ff32..d4e2392 100644 --- a/PVE/API2/Storage/Content.pm +++ b/PVE/API2/Storage/Content.pm @@ -87,8 +87,8 @@ __PACKAGE__->register_method ({ minimum => 0, optional => 1, }, - comment => { - description => "An optional Comment.", + notes => { + description => "Optional notes. If they contain multiple lines, only the first one is returned here.", type => 'string', optional => 1, }, diff --git a/PVE/Storage/PBSPlugin.pm b/PVE/Storage/PBSPlugin.pm index ef9bc79..fbffbdf 100644 --- a/PVE/Storage/PBSPlugin.pm +++ b/PVE/Storage/PBSPlugin.pm @@ -544,7 +544,7 @@ sub list_volumes { }; $info->{verification} = $item->{verification} if defined($item->{verification}); - $info->{comment} = $item->{comment} if defined($item->{comment}); + $info->{notes} = $item->{comment} if defined($item->{comment}); push @$res, $info; } diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index c60d84b..1c86666 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -19,7 +19,7 @@ use base qw(PVE::SectionConfig); use constant COMPRESSOR_RE => 'gz|lzo|zst'; -use constant COMMENT_EXT => ".comment"; +use constant NOTES_EXT => ".notes"; our @COMMON_TAR_FLAGS = qw( --one-file-system @@ -1035,10 +1035,10 @@ my $get_subdir_files = sub { $info->{vmid} = $vmid // $1; } - my $comment_fn = $original.COMMENT_EXT; - if (-f $comment_fn) { - my $comment = PVE::Tools::file_read_firstline($comment_fn); - $info->{comment} = $comment if defined($comment); + my $notes_fn = $original.NOTES_EXT; + if (-f $notes_fn) { + my $notes = PVE::Tools::file_read_firstline($notes_fn); + $info->{notes} = $notes if defined($notes); } } elsif ($tt eq 'snippets') { -- 2.20.1