Skip to content

Commit 18bfb35

Browse files
committed
classify another lockfile (generation) error
1 parent 756696f commit 18bfb35

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/prepare.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,10 @@ fn run_command(cmd: Command) -> anyhow::Result<()> {
164164
|| line.contains("error: invalid type: ")
165165
|| line.contains("error: cyclic feature dependency: feature ")
166166
|| line.contains("error: cyclic package dependency: package ")
167+
|| (line.contains("error: package collision in the lockfile: packages ")
168+
&& line.contains(
169+
" are different, but only one can be written to lockfile unambiguously",
170+
))
167171
{
168172
broken_deps = true;
169173
} else if line.contains("error: failed to parse lock file at")

tests/buildtest/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ test_prepare_error_stderr!(
337337
"error: Attempting to resolve a dependency with more than one crate with links=ring-asm"
338338
);
339339

340-
test_prepare_uncategorized_err!(
340+
test_prepare_error_stderr!(
341341
test_lockfile_collision,
342342
"lockfile-collision",
343343
BrokenDependencies,

0 commit comments

Comments
 (0)