more broken lockfile

Author: Skgland

src/prepare.rs

@@ -164,7 +164,11 @@ fn run_command(cmd: Command) -> anyhow::Result<()> {
             || line.contains("error: cyclic package dependency: package ")
         {
             broken_deps = true;
-        } else if line.contains("error: failed to parse lock file at") {
+        } else if line.contains("error: failed to parse lock file at")
+            || line.contains(
+                "error: Attempting to resolve a dependency with more than one crate with links=",
+            )
+        {
             broken_lockfile = true;
         }
     };

tests/buildtest/mod.rs

@@ -330,7 +330,7 @@ test_prepare_error_stderr!(
     "error: invalid type: map, expected a string"
 );
 
-test_prepare_uncategorized_err!(
+test_prepare_error_stderr!(
     test_invalid_cargotoml_conflicting_links,
     "invalid-cargotoml-conflicting-links",
     InvalidCargoLock,