matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix: Remove call to deprecated function

Browse source
This commit is contained in:
Matthias Beyer 2018-10-07 15:08:25 +02:00
parent cb0fcaffde
commit e919435504
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -222,11 +222,13 @@ impl Store {
debug!("Creating id: '{}'", id); debug!("Creating id: '{}'", id);
let exists = id.exists()? || self.entries let exists =
.read() self.backend.exists(&id.clone().into_pathbuf()?)? ||
.map(|map| map.contains_key(&id)) self.entries
.map_err(|_| Error::from(EM::LockError)) .read()
.context(format_err!("CreateCallError: {}", id))?; .map(|map| map.contains_key(&id))
.map_err(|_| Error::from(EM::LockError))
.context(format_err!("CreateCallError: {}", id))?;
if exists { if exists {
debug!("Entry exists: {:?}", id); debug!("Entry exists: {:?}", id);
@ -304,11 +306,13 @@ impl Store {
debug!("Getting id: '{}'", id); debug!("Getting id: '{}'", id);
let exists = id.exists()? || self.entries let exists =
.read() self.backend.exists(&id.clone().into_pathbuf()?)? ||
.map(|map| map.contains_key(&id)) self.entries
.map_err(|_| Error::from(EM::LockError)) .read()
.context(format_err!("GetCallError: {}", id))?; .map(|map| map.contains_key(&id))
.map_err(|_| Error::from(EM::LockError))
.context(format_err!("CreateCallError: {}", id))?;
if !exists { if !exists {
debug!("Does not exist in internal cache or filesystem: {:?}", id); debug!("Does not exist in internal cache or filesystem: {:?}", id);