From b6498d11c2f359995d63e5d91b935ec6fa5e0f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= Date: Wed, 5 Jul 2017 15:40:00 +0200 Subject: [PATCH] Consider that a failing opam is an absent opam --- src/context.ml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/context.ml b/src/context.ml index aa5e8692..d09e30f7 100644 --- a/src/context.ml +++ b/src/context.ml @@ -126,11 +126,13 @@ let opam_config_var ~env ~cache var = match Bin.opam with | None -> return None | Some fn -> - Future.run_capture Strict (Path.to_string fn) ~env ["config"; "var"; var] - >>| fun s -> - let s = String.trim s in - Hashtbl.add cache ~key:var ~data:s; - Some s + Future.run_capture (Accept All) (Path.to_string fn) ~env ["config"; "var"; var] + >>| function + | Ok s -> + let s = String.trim s in + Hashtbl.add cache ~key:var ~data:s; + Some s + | Error _ -> None let get_env env var = let rec loop i =