Consider that a failing opam is an absent opam
This commit is contained in:
parent
747cf220c6
commit
b6498d11c2
|
@ -126,11 +126,13 @@ let opam_config_var ~env ~cache var =
|
||||||
match Bin.opam with
|
match Bin.opam with
|
||||||
| None -> return None
|
| None -> return None
|
||||||
| Some fn ->
|
| Some fn ->
|
||||||
Future.run_capture Strict (Path.to_string fn) ~env ["config"; "var"; var]
|
Future.run_capture (Accept All) (Path.to_string fn) ~env ["config"; "var"; var]
|
||||||
>>| fun s ->
|
>>| function
|
||||||
let s = String.trim s in
|
| Ok s ->
|
||||||
Hashtbl.add cache ~key:var ~data:s;
|
let s = String.trim s in
|
||||||
Some s
|
Hashtbl.add cache ~key:var ~data:s;
|
||||||
|
Some s
|
||||||
|
| Error _ -> None
|
||||||
|
|
||||||
let get_env env var =
|
let get_env env var =
|
||||||
let rec loop i =
|
let rec loop i =
|
||||||
|
|
Loading…
Reference in New Issue