Merge pull request ocaml#5056 from rjbou/init-config-fx

Fix 'opam init' and 'opam init --reinit' when the `jobs` variable has been set in the opamrc or the current config
rjbou · Apr 22, 2022 · 59572fb · 59572fb
1 parent 24073c1
commit 59572fb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -16,7 +16,7 @@ New option/command/subcommand are prefixed with ◈.
   *
 
 ## Init
-  *
+  * [BUG] Fix `opam init` and `opam init --reinit` when the `jobs` variable has been set in the opamrc or the current config. [#5056 @rjbou]
 
 ## Config report
   *
@@ -121,3 +121,7 @@ New option/command/subcommand are prefixed with ◈.
 
 ## Security fixes
   *
+
+# API updates
+## opam-client
+  * `OpamClient`: fix `update_with_init_config`, when ``jobs` was set in `init_config`, it dropped rest of `config` update [#5056 @rjbou]
diff --git a/src/client/opamClient.ml b/src/client/opamClient.ml
@@ -752,9 +752,9 @@ let update_with_init_config ?(overwrite=false) config init_config =
     else conf
   in
   config |>
-  match I.jobs init_config with
+  (match I.jobs init_config with
       | Some j -> setifnew C.jobs C.with_jobs j
-      | None -> fun c -> c |>
+      | None -> fun c -> c) |>
   setifnew C.dl_tool C.with_dl_tool_opt (I.dl_tool init_config) |>
   setifnew C.dl_jobs C.with_dl_jobs
     (OpamStd.Option.default OpamStateConfig.(default.dl_jobs)