matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #1097 from matthiasbeyer/libimagstore/delete-from-fs-fix

Browse source 
Fix: Store::delete() should check FS as well
This commit is contained in:
Matthias Beyer 2017-09-21 09:29:24 +02:00 committed by GitHub
commit 9b7d958d03
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/src/09020-changelog.md
View file

@ -44,6 +44,8 @@ This section contains the changelog from the last release to the next release.
entries. This is not allowed because this namespace is reserved for the
store itself. This bug was fixed, links are now located in the `links`
namespace in the header of an entry.
* `Store::delete()` did only check the store-internal cache whether an entry
exists, but not the filesystem. This was fixed.
* Minor changes
* If building from a `nix-shell`, the mozilla rust overlay is expected to be
present

19
lib/core/libimagstore/src/store.rs
View file

@ -630,7 +630,24 @@ impl Store {
// if the entry is currently modified by the user, we cannot drop it
match entries.get(&id) {
None => {
return Err(SE::from_kind(SEK::FileNotFound)).chain_err(|| SEK::DeleteCallError)
// The entry is not in the internal cache. But maybe on the filesystem?
debug!("Seems like {:?} is not in the internal cache", id);
// Small optimization: We need the pathbuf for deleting, but when calling
// StoreId::exists(), a PathBuf object gets allocated. So we simply get a
// PathBuf here, check whether it is there and if it is, we can re-use it to
// delete the filesystem file.
let pb = try!(id.into_pathbuf());
if pb.exists() {
// looks like we're deleting a not-loaded file from the store.
debug!("Seems like {:?} is on the FS", pb);
return self.backend.remove_file(&pb)
} else {
debug!("Seems like {:?} is not even on the FS", pb);
return Err(SE::from_kind(SEK::FileNotFound))
.chain_err(|| SEK::DeleteCallError)
}
},
Some(e) => if e.is_borrowed() {
return Err(SE::from_kind(SEK::IdLocked)).chain_err(|| SEK::DeleteCallError)