process: homogeneise verbose command output between sandboxed and non sandboxed one

Author: rjbou

master_changes.md

@@ -111,6 +111,7 @@ users)
 ## Internal
   * Replace every polymorphic uses of `List.mem` by a version that doesn't use `Repr.equal` [#6644 @kit-ty-kate]
   * Simplify the `src_ext/update-sources.sh` script [#6701 @kit-ty-kate]
+  * Homogeneise verbose command output between sandboxed and non sandboxed one [#6675 @rjbou]
 
 ## Internal: Unix
 

src/core/opamProcess.ml

@@ -580,10 +580,15 @@ let dry_run_background c = {
 }
 
 let verbose_print_cmd p =
-  OpamConsole.msg "%s %s %s%s\n"
+  let args =
+    match p.p_args with
+    | [] -> ""
+    | args ->
+      " " ^ OpamStd.List.concat_map " " (Printf.sprintf "%S") args
+  in
+  OpamConsole.msg "%s %s%s%s\n"
     (OpamConsole.colorise `yellow "+")
-    p.p_name
-    (OpamStd.List.concat_map " " (Printf.sprintf "%S") p.p_args)
+    p.p_name args
     (if p.p_cwd = Sys.getcwd () then ""
      else Printf.sprintf " (CWD=%s)" p.p_cwd)
 

tests/reftests/depexts.test

@@ -25,7 +25,7 @@ opam believes some required external dependencies are missing. opam can:
 
 [1/2/3/4] 1
 
-+ false 
++ false
 [ERROR] System package install failed with exit code 1 at command:
             false
 [ERROR] These packages are still missing: depext-1
@@ -210,7 +210,7 @@ opam believes some required external dependencies are missing. opam can:
 
 [1/2/3/4] 1
 
-+ false 
++ false
 [ERROR] System package install failed with exit code 1 at command:
             false
 [ERROR] These packages are still missing: depext-1 depext-avail depext-ok depext-unav
@@ -243,7 +243,7 @@ opam believes some required external dependencies are missing. opam can:
 
 [1/2/3/4] 1
 
-+ false 
++ false
 [ERROR] System package install failed with exit code 1 at command:
             false
 [ERROR] These packages are still missing: depext-1 depext-avail depext-unav
@@ -304,7 +304,7 @@ opam believes some required external dependencies are missing. opam can:
 
 [1/2/3/4] 1
 
-+ false 
++ false
 [ERROR] System package install failed with exit code 1 at command:
             false
 [ERROR] These packages are still missing: depext-1 depext-avail depext-ok depext-unav

tests/reftests/process-output.unix.test

@@ -27,7 +27,7 @@ Processing  2/3: [process: true with]
 + true "with" "option" (CWD=${BASEDIR}/OPAM/outputs/.opam-switch/build/process.1)
 -> compiled  process.1
 Processing  3/3: [process: true]
-+ true  (CWD=${BASEDIR}/OPAM/outputs/.opam-switch/build/process.1)
++ true (CWD=${BASEDIR}/OPAM/outputs/.opam-switch/build/process.1)
 Processing  3/3: [process: true with]
 + true "with" "option" (CWD=${BASEDIR}/OPAM/outputs/.opam-switch/build/process.1)
 -> installed process.1