prepare: detect missing git deps even when a lockfile is present

Author: pietroalbini

src/prepare.rs

@@ -134,6 +134,7 @@ impl<'a> Prepare<'a> {
 
     fn fetch_deps(&mut self) -> Result<(), Error> {
         let mut outdated_lockfile = false;
+        let mut missing_deps = false;
         let res = Command::new(self.workspace, self.toolchain.cargo())
             .args(&["fetch", "--locked", "--manifest-path", "Cargo.toml"])
             .cd(&self.source_dir)
@@ -142,21 +143,23 @@ impl<'a> Prepare<'a> {
                     "Cargo.lock needs to be updated but --locked was passed to prevent this",
                 ) {
                     outdated_lockfile = true;
+                } else if line.contains("failed to load source for dependency") {
+                    missing_deps = true;
                 }
             })
             .run();
         match res {
-            Ok(_) => {}
+            Ok(_) => Ok(()),
             Err(_) if outdated_lockfile && !self.lockfile_captured => {
                 info!("the lockfile is outdated, regenerating it");
                 // Force-update the lockfile and recursively call this function to fetch
                 // dependencies again.
                 self.capture_lockfile(true)?;
-                return self.fetch_deps();
+                self.fetch_deps()
             }
-            err => return err.map_err(|e| e.into()),
+            Err(_) if missing_deps => Err(PrepareError::MissingDependencies.into()),
+            err => err.map_err(|e| e.into()),
         }
-        Ok(())
     }
 }
 

tests/buildtest/crates/missing-deps-git-locked/Cargo.lock

@@ -0,0 +1,10 @@
+[package]
+name = "missing-deps-git-locked"
+version = "0.1.0"
+authors = ["Pietro Albini <pietro@pietroalbini.org>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+not-a-git-repo = { git = "https://www.example.com/definitely-not-a-git-repo.git" }

tests/buildtest/crates/missing-deps-git-locked/Cargo.toml

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

tests/buildtest/crates/missing-deps-git-locked/src/main.rs

@@ -138,6 +138,12 @@ test_prepare_error!(
     MissingDependencies
 );
 
+test_prepare_error!(
+    test_missing_deps_git_locked,
+    "missing-deps-git-locked",
+    MissingDependencies
+);
+
 test_prepare_error!(
     test_missing_deps_registry,
     "missing-deps-registry",