Skip to content

Commit

Permalink
Merge pull request #6 from softprops/stdout-w-err
Browse files Browse the repository at this point in the history
combine stderr with stdout on err
  • Loading branch information
softprops committed Sep 29, 2020
2 parents 4670739 + 8876fdb commit 5e6a56c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ pub async fn exec(
if output.status.success() {
Ok(from_utf8(&output.stdout)?.to_string())
} else {
Err(anyhow!(from_utf8(&output.stderr)?.to_string()).into())
Err(anyhow!(vec![from_utf8(&output.stderr)?, from_utf8(&output.stdout)?].join("\n")).into())
}
}

0 comments on commit 5e6a56c

Please sign in to comment.