Merge pull request #4948 from rjbou/lockf-win

lockf: catch `Unix.EACCES`
ocaml · Jan 21, 2022 · f70548b · f70548b
2 parents 73fb279 + 42085f7
commit f70548b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/master_changes.md b/master_changes.md
@@ -176,6 +176,7 @@ users)
   * [BUG] check Unix.has_symlink before using Unix.symlink [#4962 @jonahbeckford]
   * OpamCudf: provide machine-readable information on conflicts caused by cycles [#4039 @gasche]
   * Remove memoization from `best_effort ()` to allow for multiple different settings during the same session (useful for libaray users) [#4805 @LasseBlaauwbroek]
+  * [BUG] Catch `EACCES` in lock function [#4948 @oandrieu - fix #4944]
 
 ## Test
   * Update crowbar with compare functions [#4918 @rjbou]

diff --git a/src/core/opamSystem.ml b/src/core/opamSystem.ml
@@ -1092,7 +1092,8 @@ let rec flock_update
          if Sys.win32 && kind <> `Lock_none then
            Unix.(lockf fd F_ULOCK 0);
          Unix.lockf fd (unix_lock_op ~dontblock:true flag) 0
-       with Unix.Unix_error (Unix.EAGAIN,_,_) ->
+       with Unix.Unix_error (Unix.EAGAIN,_,_)
+          | Unix.Unix_error (Unix.EACCES,_,_) ->
          if dontblock then
            OpamConsole.error_and_exit `Locked
              "Another process has locked %s and non blocking mode enabled"