nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

syscalls: 'with-lock-file' catches ENOSYS. 

* guix/build/syscalls.scm (call-with-file-lock): Catch ENOSYS raised by
'lock-file'.
This commit is contained in:
Ludovic Courtès 2019-06-03 17:13:30 +02:00
parent 89ceb86ad4
commit 5f0cf1df71
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
guix/build/syscalls.scm
View File

@ -1084,13 +1084,24 @@ exception if it's already taken."
#t) #t)
(define (call-with-file-lock file thunk) (define (call-with-file-lock file thunk)
(let ((port (lock-file file))) (let ((port (catch 'system-error
(lambda ()
(lock-file file))
(lambda args
;; When using the statically-linked Guile in the initrd,
;; 'fcntl-flock' returns ENOSYS unconditionally. Ignore
;; that error since we're typically the only process running
;; at this point.
(if (= ENOSYS (system-error-errno args))
#f
(apply throw args))))))
(dynamic-wind (dynamic-wind
(lambda () (lambda ()
#t) #t)
thunk thunk
(lambda () (lambda ()
(unlock-file port))))) (when port
(unlock-file port))))))
(define-syntax-rule (with-file-lock file exp ...) (define-syntax-rule (with-file-lock file exp ...)
"Wait to acquire a lock on FILE and evaluate EXP in that context." "Wait to acquire a lock on FILE and evaluate EXP in that context."