Merge pull request #4591 from AltGr/depext-msg-up

Fix and improve some depext messages

master_changes.md

@@ -71,6 +71,8 @@ New option/command/subcommand are prefixed with ◈.
   * Handle macport variants [#4509 @rjbou - fix #4297]
   * Always upgrade all the installed packages when installing a new package on Archlinux [#4556 @kit-ty-kate]
   * Handle some additional environment variables (`OPAMASSUMEDEPEXTS`, `OPAMNODEPEXTS`) [#4587 @AltGr]
+  * Improve messages to hint that answering `no` doesn't abort installation [@AltGr]
+  * Improve messages to hint that answering `no` doesn't abort installation [#4591 @AltGr]
 
 ## Sandbox
   * Fix the conflict with the environment variable name used by dune [#4535 @smorimoto - fix ocaml/dune#4166]

src/client/opamSolution.ml

@@ -386,12 +386,14 @@ let parallel_apply t
       (if bypass <> !bypass_ref then
          (let spkgs = OpamSysPkg.Set.Op.(bypass -- !bypass_ref) in
           OpamConsole.note
-            "The bypass of system package %s has been registered in this switch. You \
-             can use `opam option depext-bypass-=%s' to revert."
+            "Requirement for system package%s %s overridden in this switch. Use \
+             `opam option depext-bypass-=%s' to revert."
             (if OpamSysPkg.Set.cardinal spkgs > 1 then "s" else "")
             (OpamStd.Format.pretty_list
                (List.map OpamSysPkg.to_string
-                  (OpamSysPkg.Set.elements spkgs))));
+                  (OpamSysPkg.Set.elements spkgs)))
+            (OpamStd.List.concat_map "," OpamSysPkg.to_string
+               (OpamSysPkg.Set.elements spkgs)));
        bypass_ref := bypass;
        invariant_ref := invariant;
        let switch_config =
@@ -1106,7 +1108,7 @@ let install_depexts ?(force_depext=false) ?(confirm=true) t packages =
   else if
     not confirm || OpamConsole.confirm
       "Let opam run your package manager to install the required system \
-       packages?"
+       packages?\n(answer 'n' for other options)"
   then
     try
       OpamSysInteract.install sys_packages; (* handles dry_run *)