From 328c259a71de3bfc3ccc32e93aa9d0c44743eb13 Mon Sep 17 00:00:00 2001
From: Raja Boujbel <raja.boujbel@ocamlpro.com>
Date: Thu, 3 Jan 2019 17:48:07 +0100
Subject: [PATCH] config report: update description for user defined global
 vars

---
 src/client/opamConfigCommand.ml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/client/opamConfigCommand.ml b/src/client/opamConfigCommand.ml
index 67637ccbc8f..9bd04dc9d0d 100644
--- a/src/client/opamConfigCommand.ml
+++ b/src/client/opamConfigCommand.ml
@@ -29,10 +29,25 @@ let help t =
       all_global_vars
       (OpamVariable.Map.map snd t.switch_global.global_variables)
   in
-  List.map (fun (var, doc) -> [
+  let env = OpamPackageVar.resolve t in
+  List.map (fun (var, doc) ->
+      let content =
+        OpamFilter.ident_string env ~default:"" ([],var,None)
+      in
+      let doc =
+        if doc = OpamGlobalState.inferred_from_system then
+          match OpamStd.Option.Op.(
+              OpamVariable.Map.find_opt var t.switch_global.global_variables
+              >>| fst
+              >>= Lazy.force) with
+          | Some c when (OpamVariable.string_of_variable_contents c) <> content ->
+            "Set throught local opam config or env"
+          | _ -> doc
+        else doc
+      in
+      [
         OpamVariable.to_string var % `bold;
-        OpamFilter.ident_string (OpamPackageVar.resolve t) ~default:""
-          ([],var,None) % `blue;
+        content % `blue;
         "#"; doc
       ])
     (OpamVariable.Map.bindings all_global_vars) |>