From 80dbf071bef98e603fb281a35423fe797183fa74 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 21 May 2024 04:03:45 +0800 Subject: [PATCH] don't map errors so we can see what the underlying problem is --- tools/src/sign_image.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/src/sign_image.rs b/tools/src/sign_image.rs index ac26a00ae..2c0bda21c 100644 --- a/tools/src/sign_image.rs +++ b/tools/src/sign_image.rs @@ -1,4 +1,4 @@ -use std::io::{Error, ErrorKind, Read, Write}; +use std::io::{Read, Write}; use std::path::Path; use ed25519_dalek::{DigestSigner, SigningKey}; @@ -37,9 +37,7 @@ pub fn sign_image( let minver_bytes = if let Some(mv) = minver { mv.into() } else { [0u8; 16] }; let semver: [u8; 16] = match semver { Some(semver) => semver, - None => SemVer::from_git() - .map_err(|_| Error::new(ErrorKind::Other, "error parsing current Git rev"))? - .into(), + None => SemVer::from_git()?.into(), }; // extra data appended here needs to be reflected in two places in Xous: @@ -117,9 +115,7 @@ pub fn sign_image_prehash( let minver_bytes = if let Some(mv) = minver { mv.into() } else { [0u8; 16] }; let semver: [u8; 16] = match semver { Some(semver) => semver, - None => SemVer::from_git() - .map_err(|_| Error::new(ErrorKind::Other, "error parsing current Git rev"))? - .into(), + None => SemVer::from_git()?.into(), }; // extra data appended here needs to be reflected in two places in Xous: