lock: don't interrupt at non terminal signals

Signals like SIGWINCH (window resize) interrupt a blocking lock.
ocaml · Mar 27, 2019 · 28c339e · 28c339e
1 parent 39d0157
commit 28c339e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/core/opamSystem.ml b/src/core/opamSystem.ml
@@ -821,8 +821,11 @@ let rec flock_update
          OpamConsole.formatted_msg
            "Another process has locked %s, waiting (%s to abort)... "
            file (if Sys.win32 then "CTRL+C" else "C-c");
-         (try Unix.lockf fd (unix_lock_op ~dontblock:false flag) 0;
-          with Sys.Break as e -> OpamConsole.msg "\n"; raise e);
+         let rec lock_w_ignore_sig () =
+           try Unix.lockf fd (unix_lock_op ~dontblock:false flag) 0;
+           with Sys.Break as e -> (OpamConsole.msg "\n"; raise e)
+              | Unix.Unix_error (Unix.EINTR,_,_) -> lock_w_ignore_sig ()
+         in lock_w_ignore_sig ();
          OpamConsole.msg "lock acquired.\n");
     lock.kind <- (flag :> lock_flag)
   | _ -> assert false