matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #1394 from matthiasbeyer/libimagentryref/fix-path-when-making-ref

Browse source 
Fix: Pass the right path variable here
This commit is contained in:
Matthias Beyer 2018-04-13 15:54:38 +02:00 committed by GitHub
commit 00b6f4ded3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/entry/libimagentryref/src/refstore.rs
View file

@ -103,7 +103,7 @@ impl<'a> RefStore<'a> for Store {
fn create_ref<RPG: UniqueRefPathGenerator, A: AsRef<Path>>(&'a self, path: A) fn create_ref<RPG: UniqueRefPathGenerator, A: AsRef<Path>>(&'a self, path: A)
-> Result<FileLockEntry<'a>, RPG::Error> -> Result<FileLockEntry<'a>, RPG::Error>
{ {
let hash = RPG::unique_hash(path)?; let hash = RPG::unique_hash(&path)?;
let pathbuf = PathBuf::from(format!("{}/{}", RPG::collection(), hash)); let pathbuf = PathBuf::from(format!("{}/{}", RPG::collection(), hash));
let sid = StoreId::new_baseless(pathbuf.clone()).map_err(RE::from)?; let sid = StoreId::new_baseless(pathbuf.clone()).map_err(RE::from)?;
@ -111,7 +111,7 @@ impl<'a> RefStore<'a> for Store {
self.create(sid) self.create(sid)
.map_err(RE::from) .map_err(RE::from)
.and_then(|mut fle| { .and_then(|mut fle| {
fle.make_ref(hash, pathbuf)?; fle.make_ref(hash, path)?;
Ok(fle) Ok(fle)
}) })
.map_err(RPG::Error::from) .map_err(RPG::Error::from)