From 46a61a7473c84017aa941ba8a610e48368b2ba97 Mon Sep 17 00:00:00 2001 From: Lucas Schwiderski Date: Fri, 17 Nov 2023 09:58:53 +0100 Subject: [PATCH 1/2] Use exit status to determine LJD failure --- lib/sdk/src/filetype/lua.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/sdk/src/filetype/lua.rs b/lib/sdk/src/filetype/lua.rs index 3979b7a..5cd371d 100644 --- a/lib/sdk/src/filetype/lua.rs +++ b/lib/sdk/src/filetype/lua.rs @@ -92,9 +92,10 @@ where let output = cmd.output().wrap_err("Failed to run ljd")?; - if !output.stderr.is_empty() { + if !output.status.success() { eyre::bail!( - "Decompilation failed: {}", + "LJD exited with code {:?}:\n{}", + output.status.code(), String::from_utf8_lossy(&output.stderr) ); } -- 2.45.3 From 4ec44720b0a4c376225f95613950b4d51961a3ef Mon Sep 17 00:00:00 2001 From: Lucas Schwiderski Date: Fri, 17 Nov 2023 15:10:20 +0100 Subject: [PATCH 2/2] sdk: Don't fail decompilation on LJD error --- lib/sdk/src/filetype/lua.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/sdk/src/filetype/lua.rs b/lib/sdk/src/filetype/lua.rs index 5cd371d..2458dec 100644 --- a/lib/sdk/src/filetype/lua.rs +++ b/lib/sdk/src/filetype/lua.rs @@ -93,11 +93,12 @@ where let output = cmd.output().wrap_err("Failed to run ljd")?; if !output.status.success() { - eyre::bail!( + let err = eyre::eyre!( "LJD exited with code {:?}:\n{}", output.status.code(), String::from_utf8_lossy(&output.stderr) ); + tracing::error!("Failed to decompile '{}':\n{:?}", name, err); } let content = output.stdout; -- 2.45.3