Merge pull request ocaml#4934 from dra27/multiple-caches-take-2

Actually permit multiple state caches to co-exist
rjbou · Apr 22, 2022 · 373bf48 · 373bf48
1 parent 17a0571
commit 373bf48
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -81,7 +81,7 @@ New option/command/subcommand are prefixed with ◈.
   *
 
 ## State
-  *
+  * Actually allow multiple state caches to co-exist [#4934 @dra27 - fix #4554 properly this time]
 
 # Opam file format
   *

diff --git a/src/state/opamRepositoryState.ml b/src/state/opamRepositoryState.ml
@@ -36,8 +36,7 @@ module Cache = struct
     in
     List.iter remove_cache_file (OpamFilename.files cache_dir)
 
-  let save rt =
-    let file = OpamPath.state_cache rt.repos_global.root in
+  let marshall rt =
     (* Repository without remote are not cached, they are intended to be
        manually edited *)
     let filter_out_nourl repos_map =
@@ -49,17 +48,23 @@ module Cache = struct
            with Not_found -> false)
         repos_map
     in
-    let t =
       { cached_repofiles =
           OpamRepositoryName.Map.bindings
             (filter_out_nourl rt.repos_definitions);
         cached_opams =
           OpamRepositoryName.Map.bindings
             (filter_out_nourl rt.repo_opams);
       }
-    in
+
+  let file rt =
+    OpamPath.state_cache rt.repos_global.root
+
+  let save rt =
     remove ();
-    C.save file t
+    C.save (file rt) (marshall rt)
+
+  let save_new rt =
+    C.save (file rt) (marshall rt)
 
   let load root =
     let file = OpamPath.state_cache root in
@@ -231,7 +236,7 @@ let load lock_kind gt =
         repos_map (OpamRepositoryName.Map.empty, OpamRepositoryName.Map.empty)
     in
     let rt = make_rt repofiles opams in
-    Cache.save rt;
+    Cache.save_new rt;
     rt
 
 let find_package_opt rt repo_list nv =