Set log dir as temporary directory on safe mode

src/client/opamArg.ml

@@ -107,8 +107,10 @@ let environment_variables =
        backups. This skips some finalisers and may also help to get more \
        reliable backtraces.";
       "LOGS", cli_original, (fun v -> LOGS (env_string v)),
-      ("$(i,logdir) sets log directory, default is a temporary directory in \
-       " ^ (if Sys.win32 then "%TEMP%" else "/tmp"));
+      (Printf.sprintf
+         "$(i,logdir) sets log directory, default 'log' directory in opam root\
+          if opam is initialise, temporary directory in %s otherwise"
+         (if Sys.win32 then "%TEMP%" else "/tmp"));
       "MERGEOUT", cli_original, (fun v -> MERGEOUT (env_bool v)),
       "merge process outputs, stderr on stdout.";
       "NO", cli_original, (fun v -> NO (env_bool v)),

src/client/opamClientConfig.ml

@@ -216,7 +216,7 @@ let search_files = ["findlib"]
 
 open OpamStd.Op
 
-let opam_init ?root_dir ?strict ?solver =
+let opam_init ?root_dir ?safe_mode ?strict ?solver =
   let open OpamStd.Option.Op in
 
   (* (i) get root dir *)
@@ -262,14 +262,17 @@ let opam_init ?root_dir ?strict ?solver =
   let log_dir =
     OpamStd.Option.map OpamFilename.Dir.to_string @@
     if log_dir = None && initialised
-       && OpamCoreConfig.E.logs () = None then
+       && OpamCoreConfig.E.logs () = None
+       && not ((OpamCoreConfig.E.safe () = Some true)
+               || (safe_mode = Some true))
+               then
       (* fixme: in order to not revert [OPAMLOGS] value,
          we need to check it here *)
       Some (OpamPath.log root)
     else log_dir
   in
   (fun () -> ()) |>
-  OpamCoreConfig.initk ?log_dir |>
+  OpamCoreConfig.initk ?safe_mode ?log_dir |>
   OpamRepositoryConfig.initk |>
   OpamSolverConfig.initk ?solver |>
   OpamStateConfig.initk ~root_dir:root ~root_from |>

src/client/opamClientConfig.mli

@@ -99,6 +99,7 @@ val search_files: string list
     sub-libraries, overriding the given arguments *)
 val opam_init:
   ?root_dir:OpamTypes.dirname ->
+  ?safe_mode:bool ->
   ?strict:bool ->
   ?solver:(module OpamCudfSolver.S) Lazy.t ->
   ?skip_version_checks:bool ->
@@ -165,7 +166,6 @@ val opam_init:
   ?disp_status_line:OpamStd.Config.when_ ->
   ?confirm_level:OpamStd.Config.answer ->
   ?yes:bool option ->
-  ?safe_mode:bool ->
   ?keep_log_dir:bool ->
   ?errlog_length:int ->
   ?merged_output:bool ->

src/core/opamCoreConfig.mli

@@ -33,6 +33,7 @@ module E : sig
     val confirmlevel: unit -> OpamStd.Config.answer option
     val debug: unit -> int option
     val logs: unit -> string option
+    val safe: unit -> bool option
     val yes: unit -> bool option
 end
 

tests/reftests/dune.inc

@@ -1595,6 +1595,27 @@
    %{targets}
    (run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:resolve-variables.test} %{read-lines:testing-env}))))
 
+(rule
+ (alias reftest-safe)
+ (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))
+ (action
+  (diff safe.test safe.out)))
+
+(alias
+ (name reftest)
+ (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))
+ (deps (alias reftest-safe)))
+
+(rule
+ (targets safe.out)
+ (deps root-N0REP0)
+ (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))
+ (package opam)
+ (action
+  (with-stdout-to
+   %{targets}
+   (run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:safe.test} %{read-lines:testing-env}))))
+
 (rule
  (alias reftest-shared-fetch)
  (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))

tests/reftests/safe.test

@@ -0,0 +1,47 @@
+N0REP0
+### OPAMYES=1
+### :I: opam log dir and safe mode
+### <pin:varos/varos.opam>
+opam-version: "2.0"
+build: [
+  [make "all"]
+  [make "test"] {with-test}
+]
+### <cat-makefile.sh>
+f=$1
+cat > $f << EOF
+all:
+	echo \$(shell ${OPAM} var os-version --safe)
+	${OPAM} var os-version --safe
+	echo done
+EOF
+### sh cat-makefile.sh varos/Makefile
+### opam switch create varos --empty
+### # opam install foo bar
+### opam pin ./varos -n
+[NOTE] Package varos does not exist in opam repositories registered in the current switch.
+varos is now pinned to file://${BASEDIR}/varos (version dev)
+### opam install varos -v | sed-cmd make
+
+<><> Synchronising pinned packages ><><><><><><><><><><><><><><><><><><><><><><>
+Processing  1/1: [varos.dev: rsync]
+[varos.dev] synchronised (no changes)
+
+The following actions will be performed:
+=== install 1 package
+  - install varos dev (pinned)
+
+<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+Processing  1/3: [varos.dev: rsync]
+-> retrieved varos.dev  (file://${BASEDIR}/varos)
+Processing  2/3: [varos: make all]
++ make "all" (CWD=${BASEDIR}/OPAM/varos/.opam-switch/build/varos.dev)
+- echo n/a
+- n/a
+- ${OPAM} var os-version --safe
+- n/a
+- echo done
+- done
+-> compiled  varos.dev
+-> installed varos.dev
+Done.