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 3B10F6194D for ; Mon, 30 Nov 2020 16:22:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3932617E07 for ; Mon, 30 Nov 2020 16:22:48 +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 C177417DFD for ; Mon, 30 Nov 2020 16:22:47 +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 9160D4439D for ; Mon, 30 Nov 2020 16:22:47 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Mon, 30 Nov 2020 16:22:19 +0100 Message-Id: <20201130152220.658777-4-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201130152220.658777-1-f.gruenbichler@proxmox.com> References: <20201130152220.658777-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.024 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 Subject: [pbs-devel] [PATCH proxmox-backup 3/4] gc: remove duplicate variable 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: Mon, 30 Nov 2020 15:22:48 -0000 list_images already returns absolute paths, we don't need to prepend anything. Signed-off-by: Fabian Grünbichler --- src/backup/datastore.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs index 2700d6e9..8ea0a753 100644 --- a/src/backup/datastore.rs +++ b/src/backup/datastore.rs @@ -491,26 +491,24 @@ impl DataStore { } } - let path = self.chunk_store.relative_path(&img); - - match std::fs::File::open(&path) { + match std::fs::File::open(&img) { Ok(file) => { if let Ok(archive_type) = archive_type(&img) { if archive_type == ArchiveType::FixedIndex { let index = FixedIndexReader::new(file).map_err(|e| { - format_err!("can't read index '{}' - {}", path.to_string_lossy(), e) + format_err!("can't read index '{}' - {}", img.to_string_lossy(), e) })?; self.index_mark_used_chunks(index, &img, status, worker)?; } else if archive_type == ArchiveType::DynamicIndex { let index = DynamicIndexReader::new(file).map_err(|e| { - format_err!("can't read index '{}' - {}", path.to_string_lossy(), e) + format_err!("can't read index '{}' - {}", img.to_string_lossy(), e) })?; self.index_mark_used_chunks(index, &img, status, worker)?; } } } Err(err) if err.kind() == io::ErrorKind::NotFound => (), // ignore vanished files - Err(err) => bail!("can't open index {} - {}", path.to_string_lossy(), err), + Err(err) => bail!("can't open index {} - {}", img.to_string_lossy(), err), } done += 1; -- 2.20.1