Fix 'PermissionDenied' during rename of temporary clone directory (#162)

rossmacarthur · Feb 11, 2023 · 6751f79 · 6751f79
1 parent c1dbd3b
commit 6751f79
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/lock/source/git.rs b/src/lock/source/git.rs
@@ -79,9 +79,11 @@ fn checkout(
 fn install(ctx: &Context, dir: PathBuf, url: &Url, checkout: GitCheckout) -> Result<LockedSource> {
     let temp_dir =
         TempPath::new_force(&dir).context("failed to prepare temporary clone directory")?;
-    let repo = git::clone(url, temp_dir.path())?;
-    git::checkout(&repo, checkout.resolve(&repo)?)?;
-    git::submodule_update(&repo).context("failed to recursively update")?;
+    {
+        let repo = git::clone(url, temp_dir.path())?;
+        git::checkout(&repo, checkout.resolve(&repo)?)?;
+        git::submodule_update(&repo).context("failed to recursively update")?;
+    } // `repo` must be dropped before renaming the directory
     temp_dir
         .rename(&dir)
         .context("failed to rename temporary clone directory")?;