tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gc: remove duplicate variable 

list_images already returns absolute paths, we don't need to prepend
anything.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-11-30 16:22:19 +01:00 committed by Dietmar Maurer
parent cb4b721cb0
commit efcac39d34
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backup/datastore.rs
View File

@ -491,26 +491,24 @@ impl DataStore {
} }
} }
let path = self.chunk_store.relative_path(&img); match std::fs::File::open(&img) {
match std::fs::File::open(&path) {
Ok(file) => { Ok(file) => {
if let Ok(archive_type) = archive_type(&img) { if let Ok(archive_type) = archive_type(&img) {
if archive_type == ArchiveType::FixedIndex { if archive_type == ArchiveType::FixedIndex {
let index = FixedIndexReader::new(file).map_err(|e| { 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)?; self.index_mark_used_chunks(index, &img, status, worker)?;
} else if archive_type == ArchiveType::DynamicIndex { } else if archive_type == ArchiveType::DynamicIndex {
let index = DynamicIndexReader::new(file).map_err(|e| { 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)?; self.index_mark_used_chunks(index, &img, status, worker)?;
} }
} }
} }
Err(err) if err.kind() == io::ErrorKind::NotFound => (), // ignore vanished files 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; done += 1;