Skip to content

Commit

Permalink
Merge branch 'better-error-message-for-quilt' into 'master'
Browse files Browse the repository at this point in the history
improve the error message when a panic happens inside expect_success function

See merge request rust-team/debcargo!44
  • Loading branch information
infinity0 committed Oct 28, 2022
2 parents ac524b7 + d186865 commit 991fc70
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/debian/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ it's a maintenance burden. Use debcargo.toml instead."
.current_dir(&output_dir)
.env("QUILT_PATCHES", tempdir.path().join("patches"))
.args(&["push", "--quiltrc=-", "-a"]),
"failed to apply patches",
"failed to apply patches using quilt",
);
crate_info.replace_manifest(&output_dir.join("Cargo.toml"))?;
expect_success(
Expand Down
2 changes: 1 addition & 1 deletion src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ pub fn expect_success(cmd: &mut Command, err: &str) {
}
}
Err(e) => {
panic!("{}", e);
panic!("{}\n{}", err, e);
}
}
}
Expand Down

0 comments on commit 991fc70

Please sign in to comment.