From bd74aeeccc0928c5124416cc1232cb9585070985 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 15 Jan 2024 13:13:59 +0200 Subject: [PATCH] feat: show absolute path name for runcmd "in directory" This is more helpful than ".". Signed-off-by: Lars Wirzenius --- src/runcmd.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/runcmd.rs b/src/runcmd.rs index da99058..1674a5d 100644 --- a/src/runcmd.rs +++ b/src/runcmd.rs @@ -1,4 +1,7 @@ -use std::{path::Path, process::Command}; +use std::{ + path::{Path, PathBuf}, + process::Command, +}; use radicle_ci_broker::msg::{MessageError, Response}; @@ -18,7 +21,8 @@ pub fn runcmd(run_log: &mut RunLog, argv: &[&str], cwd: &Path) -> Result<(), Run run_log.runcmd( argv, - cwd, + &cwd.canonicalize() + .map_err(|e| RunCmdError::Canonicalize(cwd.into(), e))?, exit.code().unwrap(), &output.stdout, &output.stderr, @@ -50,4 +54,7 @@ pub enum RunCmdError { #[error("command failed with exit code {0}: {1:?}")] CommandFailed(i32, Vec), + + #[error("failed to make pathname absolute: {0}")] + Canonicalize(PathBuf, #[source] std::io::Error), }