Skip to content

Commit b5a74f7

Browse files
committed
proxy: Drop double-wrapping in RequestInitiationError
See bootc-dev/bootc#1284 - the error text is `ERROR Upgrading: Creating importer: failed to invoke method OpenImage: failed to invoke method OpenImage: lstat ...` This fixes the duplication of `failed to invoke method OpenImage`. I think this was a regression from porting to use thiserror when I was changing the type of each individual function to return our Result type. Signed-off-by: Colin Walters <[email protected]>
1 parent 060e435 commit b5a74f7

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/imageproxy.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -446,12 +446,7 @@ impl ImageProxy {
446446
let req = Self::impl_request_raw(Arc::clone(&self.sockfd), Request::new(method, args));
447447
let mut childwait = self.childwait.lock().await;
448448
tokio::select! {
449-
r = req => {
450-
r.map_err(|e| Error::RequestInitiationFailure {
451-
method: method.to_string().into(),
452-
error: e.to_string().into()
453-
})
454-
}
449+
r = req => { r }
455450
r = childwait.as_mut() => {
456451
let r = r.map_err(|e| Error::Other(e.to_string().into()))??;
457452
let stderr = String::from_utf8_lossy(&r.stderr);

0 commit comments

Comments
 (0)