system: fix apply_cygpath_path_transform

ocaml · Nov 2, 2023 · 9f44e00 · 9f44e00
1 parent c4961ba
commit 9f44e00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -158,3 +158,4 @@ users)
   * `OpamSystem.mk_temp_dir`: resolve real path with `OpamSystem.real_path` before returning it [#5654 @rjbou]
   * `OpamSystem.resolve_command`: in command resolution path, check that the file is not a directory and that it is a regular file [#5606 @rjbou - fix #5585 #5597 #5650 #5626]
   * `OpamStd.Config.env_level`: fix level parsing, it was inverted (eg, "no" gives level 1, and "yes" level 0) [#5686 @smorimoto]
+  * `OpamSystem.apply_cygpath_path_transform`: fix cygpath call, use resoved name [#5716 @rjbou]
diff --git a/src/core/opamSystem.ml b/src/core/opamSystem.ml
@@ -548,10 +548,12 @@ let get_cygpath_function =
     let f = Lazy.from_val (fun x -> x) in
     fun ~command:_ -> f
 
-let apply_cygpath_path_transform path =
+let apply_cygpath_path_transform cygpath path =
   let r =
     OpamProcess.run
-      (OpamProcess.command ~name:(temp_file "command") ~verbose:false "cygpath" ["--path"; "--"; path])
+      (OpamProcess.command ~name:(temp_file "command") ~verbose:false
+         cygpath
+         ["--path"; "--"; path])
   in
   OpamProcess.cleanup ~force:true r;
   if OpamProcess.is_success r then
@@ -565,7 +567,7 @@ let get_cygpath_path_transform =
   if Sys.win32 then
     lazy (
       match resolve_command "cygpath" with
-      | Some _ -> apply_cygpath_path_transform
+      | Some cygpath -> apply_cygpath_path_transform cygpath
       | None -> fun x -> x)
   else
     Lazy.from_val (fun x -> x)