use safe mode to select log dir under opam root or keep default /tmp

Author: rjbou

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/safe.test

@@ -36,32 +36,12 @@ 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)
-- Fatal error:
-- ${OPAM}: "open" failed on ${BASEDIR}/OPAM/log/log-809688-c518ec.out: Read-only file system
-- echo 
-- 
+- echo n/a
+- n/a
 - ${OPAM} var os-version --safe
-- Fatal error:
-- ${OPAM}: "open" failed on ${BASEDIR}/OPAM/log/log-809690-7328ea.out: Read-only file system
-- make: *** [Makefile:3: all] Error 99
-[ERROR] The compilation of varos.dev failed at "make all".
-
-##% output ###
-# Fatal error:
-# ${OPAM}: "open" failed on ${BASEDIR}/OPAM/log/log-809688-c518ec.out: Read-only file system
-# echo 
-# 
-# ${OPAM} var os-version --safe
-# Fatal error:
-# ${OPAM}: "open" failed on ${BASEDIR}/OPAM/log/log-809690-7328ea.out: Read-only file system
-# make: *** [Makefile:3: all] Error 99
-
-
-
-<><> Error report <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
-+- The following actions failed
-| - build varos dev
-+- 
-- No changes have been performed
-'${OPAM} install varos -v' failed.
-# Return code 31 #
+- n/a
+- echo done
+- done
+-> compiled  varos.dev
+-> installed varos.dev
+Done.