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 BDAD672A6E for ; Tue, 24 May 2022 10:28:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B44A01BFB9 for ; Tue, 24 May 2022 10:28:21 +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 19D801BFD0 for ; Tue, 24 May 2022 10:28: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 DF6F14382F for ; Tue, 24 May 2022 10:28:20 +0200 (CEST) From: Stefan Sterz To: pbs-devel@lists.proxmox.com Date: Tue, 24 May 2022 10:28:13 +0200 Message-Id: <20220524082816.97270-3-s.sterz@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220524082816.97270-1-s.sterz@proxmox.com> References: <20220524082816.97270-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.044 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: [pbs-devel] [PATCH proxmox-backup v3 2/5] fix: datastore: make relative_group_path() return relative path 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: Tue, 24 May 2022 08:28:51 -0000 previously the BackGroup trait used the datastore's namespace_path() method to construct a base path. this would result in it returning an absolute path equivalent to full_group_path(). use the namspace's path() method instead to get a relative path, in-line with backup_dir's relative_path(). Signed-off-by: Stefan Sterz --- pbs-datastore/src/backup_info.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs index 3128ee24..0711fcfa 100644 --- a/pbs-datastore/src/backup_info.rs +++ b/pbs-datastore/src/backup_info.rs @@ -74,7 +74,7 @@ impl BackupGroup { } pub fn relative_group_path(&self) -> PathBuf { - let mut path = self.store.namespace_path(&self.ns); + let mut path = self.ns.path(); path.push(self.group.ty.as_str()); path.push(&self.group.id); path -- 2.30.2