From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 1 Jun 2021 00:30:43 +0000 (+0100)
Subject: Slight error message tweaks
X-Git-Tag: otter-0.7.0~164
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6b18346902207cbd04039b0093f2a9ad0f80bf12;p=otter.git

Slight error message tweaks

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 4de91e30..7e3cf2fa 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -624,7 +624,7 @@ fn connect(ma: &MainOpts) -> Conn {
       ];
       cmd.args(args);
 
-      let desc = (&ma.ssh_command, &args).to_debug();
+      let desc = format!("ssh: {:?} {:?}", &ma.ssh_command, &args);
 
       let (w,r) = childio::run_pair(cmd, desc.clone())
         .with_context(|| desc.clone())
diff --git a/src/childio.rs b/src/childio.rs
index 98231c68..647a5e79 100644
--- a/src/childio.rs
+++ b/src/childio.rs
@@ -50,7 +50,7 @@ impl<RW> ChildIo<RW> {
       Some(es) => {
         let mut child = self.child.lock();
         child.reported = true;
-        let ae = anyhow!("{} failed: {}", &child, es);
+        let ae = anyhow!("{}: failed: {}", &child, es);
         Err(io::Error::new(ErrorKind::Other, ae))
       },
     }