Allow negative debug level to remove timestamps

dra27 · dra27 · commit d59bf8538f70 · 2018-07-11T15:02:57.000+01:00
diff --git a/src/client/opamCommands.ml b/src/client/opamCommands.ml
@@ -89,7 +89,7 @@ let global_options =
     if self_upgrade_status = `None then
       switch_to_updated_self
         OpamStd.Option.Op.(options.debug_level ++
-                           OpamStd.Config.env_level "DEBUG" +! 0 > 0)
+                           OpamStd.Config.env_level "DEBUG" +! 0 |> abs > 0)
         (OpamStateConfig.opamroot ?root_dir:options.opt_root ());
     let root_is_ok =
       OpamStd.Option.default false (OpamStd.Config.env_bool "ROOTISOK")
diff --git a/src/core/opamConsole.ml b/src/core/opamConsole.ml
@@ -13,7 +13,7 @@ open OpamCompat
 
 (* Global configuration *)
 
-let debug () = OpamCoreConfig.(!r.debug_level) > 0
+let debug () = abs OpamCoreConfig.(!r.debug_level) > 0
 
 let verbose () = OpamCoreConfig.(!r.verbose_level) > 0
 
@@ -496,19 +496,21 @@ let timestamp () =
     (int_of_float (1000.0 *. msec))
 
 let log section ?(level=1) fmt =
-  if level <= OpamCoreConfig.(!r.debug_level) then
+  let debug_level = OpamCoreConfig.(!r.debug_level) in
+  if level <= abs debug_level then
     let () = clear_status () in
+    let timestamp = if debug_level < 0 then "" else timestamp () ^ "  " in
     if Sys.win32 then begin
       (*
        * In order not to break [slog], split the output into two. A side-effect
        * of this is that logging lines may not use colour.
        *)
-      win32_print_message `stderr (Printf.sprintf "%s  %a  "
-        (timestamp ()) (acolor_with_width (Some 30) `yellow) section);
+      win32_print_message `stderr (Printf.sprintf "%s%a  "
+        timestamp (acolor_with_width (Some 30) `yellow) section);
       Printf.fprintf stderr (fmt ^^ "\n%!") end
     else
-      Printf.fprintf stderr ("%s  %a  " ^^ fmt ^^ "\n%!")
-        (timestamp ()) (acolor_w 30 `yellow) section
+      Printf.fprintf stderr ("%s%a  " ^^ fmt ^^ "\n%!")
+        timestamp (acolor_w 30 `yellow) section
   else
     Printf.ifprintf stderr fmt
 
diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
@@ -32,7 +32,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
   match
     Mccs.resolve_cudf
       ~solver
-      ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+      ~verbose:OpamCoreConfig.(abs !r.debug_level >= 2)
       ?timeout criteria cudf
   with
   | None -> raise Common.CudfSolver.Unsat
diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
@@ -52,7 +52,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
           command
       in
       OpamSystem.command
-        ~verbose:(OpamCoreConfig.(!r.debug_level >= 2))
+        ~verbose:(OpamCoreConfig.(abs !r.debug_level >= 2))
         cmd
     in
     OpamFilename.remove solver_in;
