Skip to content

Commit 9a2c168

Browse files
committed
more broken lockfile
1 parent 77fd211 commit 9a2c168

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/prepare.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,11 @@ fn run_command(cmd: Command) -> anyhow::Result<()> {
165165
|| line.contains("error: cyclic package dependency: package ")
166166
{
167167
broken_deps = true;
168-
} else if line.contains("error: failed to parse lock file at") {
168+
} else if line.contains("error: failed to parse lock file at")
169+
|| line.contains(
170+
"error: Attempting to resolve a dependency with more than one crate with links=",
171+
)
172+
{
169173
broken_lockfile = true;
170174
}
171175
};

tests/buildtest/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ test_prepare_error_stderr!(
331331
"error: invalid type: map, expected a string"
332332
);
333333

334-
test_prepare_unknown_err!(
334+
test_prepare_error_stderr!(
335335
test_invalid_cargotoml_conflicting_links,
336336
"invalid-cargotoml-conflicting-links",
337337
InvalidCargoLock,

0 commit comments

Comments
 (0)