File tree Expand file tree Collapse file tree 1 file changed +9
-7
lines changed Expand file tree Collapse file tree 1 file changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -1494,10 +1494,10 @@ end = struct
14941494 in
14951495 resolve db dep_loc dep_pkg_digest package_universe)
14961496 and + files_dir =
1497- let + lock_dir =
1497+ let * lock_dir =
14981498 Package_universe. lock_dir_path package_universe >> | Option. value_exn
14991499 in
1500- let files_dir =
1500+ let + files_dir =
15011501 let module Pkg = Dune_pkg.Lock_dir. Pkg in
15021502 (* TODO(steve): simplify this once portable lockdirs become the
15031503 default. This logic currently handles both the cases where
@@ -1509,15 +1509,17 @@ end = struct
15091509 let path_with_version =
15101510 Pkg. source_files_dir info.name (Some info.version) ~lock_dir
15111511 in
1512- let path_with_version_exists =
1513- Path.Untracked. exists (Path. source path_with_version)
1512+ let * path_with_version_exists =
1513+ Fs_memo. dir_exists (Path.Outside_build_dir. In_source_dir path_with_version)
15141514 in
15151515 match path_with_version_exists with
1516- | true -> Some (Pkg. files_dir info.name (Some info.version) ~lock_dir )
1516+ | true ->
1517+ Memo. return @@ Some (Pkg. files_dir info.name (Some info.version) ~lock_dir )
15171518 | false ->
15181519 let path_without_version = Pkg. source_files_dir info.name None ~lock_dir in
1519- let path_without_version_exists =
1520- Path.Untracked. exists (Path. source path_without_version)
1520+ let + path_without_version_exists =
1521+ Fs_memo. dir_exists
1522+ (Path.Outside_build_dir. In_source_dir path_without_version)
15211523 in
15221524 (match path_without_version_exists with
15231525 | true -> Some (Pkg. files_dir info.name None ~lock_dir )
You can’t perform that action at this time.
0 commit comments