stateConfig: add original_root_dir to store non redirected root dir

dra27 · Jun 10, 2024 · b38e02b · b38e02b
1 parent 51b62da
commit b38e02b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/client/opamClientConfig.mli b/src/client/opamClientConfig.mli
@@ -120,6 +120,7 @@ val opam_init:
   ?assume_depexts:bool ->
   ?cli:OpamCLIVersion.t ->
   ?scrubbed_environment_variables:string list ->
+  ?original_root_dir:OpamTypes.dirname ->
   ?current_switch:OpamSwitch.t ->
   ?switch_from:OpamStateTypes.provenance ->
   ?jobs:int Lazy.t ->

diff --git a/src/state/opamStateConfig.ml b/src/state/opamStateConfig.ml
@@ -53,6 +53,7 @@ end
 
 type t = {
   root_dir: OpamFilename.Dir.t;
+  original_root_dir: OpamFilename.Dir.t;
   current_switch: OpamSwitch.t option;
   switch_from: provenance;
   jobs: int Lazy.t;
@@ -86,6 +87,7 @@ let default = {
       in
       concat_and_resolve local_appdata "opam"
     );
+  original_root_dir = default_root ();
   current_switch = None;
   switch_from = `Default;
   jobs = lazy (max 1 (OpamSysPoll.cores () - 1));
@@ -108,6 +110,7 @@ let default = {
 
 type 'a options_fun =
   ?root_dir:OpamFilename.Dir.t ->
+  ?original_root_dir:OpamFilename.Dir.t ->
   ?current_switch:OpamSwitch.t ->
   ?switch_from:provenance ->
   ?jobs:(int Lazy.t) ->
@@ -126,6 +129,7 @@ type 'a options_fun =
 
 let setk k t
     ?root_dir
+    ?original_root_dir
     ?current_switch
     ?switch_from
     ?jobs
@@ -144,6 +148,7 @@ let setk k t
   let (+) x opt = match opt with Some x -> x | None -> x in
   k {
     root_dir = t.root_dir + root_dir;
+    original_root_dir = t.original_root_dir + original_root_dir;
     current_switch =
       (match current_switch with None -> t.current_switch | s -> s);
     switch_from = t.switch_from + switch_from;
@@ -176,6 +181,7 @@ let initk k =
   in
   setk (setk (fun c -> r := c; k)) !r
     ?root_dir:(E.root () >>| OpamFilename.Dir.of_string)
+    ?original_root_dir:(E.root () >>| OpamFilename.Dir.of_string)
     ?current_switch
     ?switch_from
     ?jobs:(E.jobs () >>| fun s -> lazy s)

diff --git a/src/state/opamStateConfig.mli b/src/state/opamStateConfig.mli
@@ -38,6 +38,7 @@ end
 
 type t = private {
   root_dir: OpamFilename.Dir.t;
+  original_root_dir: OpamFilename.Dir.t;
   current_switch: OpamSwitch.t option;
   switch_from: provenance;
   jobs: int Lazy.t;
@@ -56,6 +57,7 @@ type t = private {
 
 type 'a options_fun =
   ?root_dir:OpamFilename.Dir.t ->
+  ?original_root_dir:OpamFilename.Dir.t ->
   ?current_switch:OpamSwitch.t ->
   ?switch_from:provenance ->
   ?jobs:(int Lazy.t) ->