[pbs-devel] [PATCH proxmox-backup 3/4] gc: remove duplicate variable
Fabian Grünbichler
f.gruenbichler at proxmox.com
Mon Nov 30 16:22:19 CET 2020
list_images already returns absolute paths, we don't need to prepend
anything.
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
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
More information about the pbs-devel
mailing list