Merge pull request #700 from diml/ignore-config-file-inside-dune

Do not load the user configuration file when INSIDE_DUNE is set
ocaml · Apr 12, 2018 · 0e7c127 · 0e7c127
2 parents db41c35 + 294d693
commit 0e7c127
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+next
+----
+
+- Do not load the user configuration file when running inside dune
+  (#..., @diml)
+
 1.0+beta20 (10/04/2018)
 -----------------------
 

diff --git a/bin/main.ml b/bin/main.ml
@@ -235,7 +235,11 @@ let common =
       match config_file with
       | No_config  -> Config.default
       | This fname -> Config.load_config_file ~fname
-      | Default    -> Config.load_user_config_file ()
+      | Default    ->
+        if Config.inside_dune then
+          Config.default
+        else
+          Config.load_user_config_file ()
     in
     let config =
       Config.merge config