summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2019-02-19 21:49:14 +0100
committerMatthias Beyer <mail@beyermatthias.de>2019-02-19 21:51:44 +0100
commit04e006154c01c262ca96c2450ab16d6441339f35 (patch)
tree0fec6558e72b8b5e5cd9353ff6b0648a50a0c059
parent22c239c21282e1b206db5624fca23aaa02d873b6 (diff)
Fix: Use "ref.relpath" as path to header value
The header value for the relative path is at "ref.relpath". This fixes the wrong selector. Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
-rw-r--r--lib/entry/libimagentryref/src/reference.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/entry/libimagentryref/src/reference.rs b/lib/entry/libimagentryref/src/reference.rs
index 96a13530..bcb7ba66 100644
--- a/lib/entry/libimagentryref/src/reference.rs
+++ b/lib/entry/libimagentryref/src/reference.rs
@@ -174,12 +174,12 @@ impl<'a, H: Hasher> Ref for RefWithHasher<'a, H> {
fn get_path(&self) -> Result<PathBuf> {
self.0
.get_header()
- .read("ref.path")
+ .read("ref.relpath")
.map_err(Error::from)?
- .ok_or_else(|| Error::from(EM::EntryHeaderFieldMissing("ref.path")))
+ .ok_or_else(|| Error::from(EM::EntryHeaderFieldMissing("ref.relpath")))
.and_then(|v| {
v.as_str()
- .ok_or_else(|| EM::EntryHeaderTypeError2("ref.path", "string"))
+ .ok_or_else(|| EM::EntryHeaderTypeError2("ref.relpath", "string"))
.map_err(Error::from)
})
.map(PathBuf::from)
@@ -199,9 +199,9 @@ impl<'a, H: Hasher> Ref for RefWithHasher<'a, H> {
.ok_or_else(|| Error::from(EM::EntryHeaderTypeError2("ref.hash.<hash>", "string")))?;
let path = ref_header
- .read("path")
+ .read("relpath")
.map_err(Error::from)?
- .ok_or_else(|| err_msg("Header missing at 'ref.path'"))?
+ .ok_or_else(|| err_msg("Header missing at 'ref.relpath'"))?
.as_str()
.map(PathBuf::from)
.ok_or_else(|| Error::from(EM::EntryHeaderTypeError2("ref.hash.<hash>", "string")))?;