tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "aflags: make flag storage error message more user-friendly" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-03-12 13:20:21 +00:00 committed by Gerrit Code Review
commit 1986c86bb2
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/aconfig/aflags/src/device_config_source.rs
View file

@ -104,11 +104,16 @@ fn read_device_config_output(command: &[&str]) -> Result<String> {
if !output.status.success() {
let reason = match output.status.code() {
Some(code) => {
format!("exit code {}, output was {}", code, str::from_utf8(&output.stdout)?)
let output = str::from_utf8(&output.stdout)?;
if !output.is_empty() {
format!("exit code {code}, output was {output}")
} else {
format!("exit code {code}")
}
}
None => "terminated by signal".to_string(),
};
bail!("failed to execute device_config: {}", reason);
bail!("failed to access flag storage: {}", reason);
}
Ok(str::from_utf8(&output.stdout)?.to_string())
}