ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ui: 'with-profile-lock' keeps going upon ENOLCK.

Browse source 
* guix/build/syscalls.scm (call-with-file-lock/no-wait): Really pass
ARGS to HANDLER.  Return #f when HANDLER is called.
* guix/ui.scm (profile-lock-handler): Emit a mere warning upon ENOLCK.
This commit is contained in:
Ludovic Courtès 2019-11-29 15:11:51 +01:00
parent 55e1dfa4dd
commit 3f8e890d91
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
guix/build/syscalls.scm
View file

@ -1127,7 +1127,9 @@ (define (call-with-file-lock/no-wait file thunk handler)
(lambda (key . args) (lambda (key . args)
(match key (match key
('flock-error ('flock-error
(handler args)) (apply handler args)
;; No open port to the lock, so return #f.
#f)
('system-error ('system-error
;; When using the statically-linked Guile in the initrd, ;; When using the statically-linked Guile in the initrd,
;; 'fcntl-flock' returns ENOSYS unconditionally. Ignore ;; 'fcntl-flock' returns ENOSYS unconditionally. Ignore

9
guix/ui.scm
View file

@ -1666,8 +1666,13 @@ (define (display-diff profile old new)
(define (profile-lock-handler profile errno . _) (define (profile-lock-handler profile errno . _)
"Handle failure to acquire PROFILE's lock." "Handle failure to acquire PROFILE's lock."
(leave (G_ "profile ~a is locked by another process~%") ;; NFS mounts can return ENOLCK. When that happens, there's not much that
profile)) ;; can be done, so warn the user and keep going.
(if (= errno ENOLCK)
(warning (G_ "cannot lock profile ~a: ~a~%")
profile (strerror errno))
(leave (G_ "profile ~a is locked by another process~%")
profile)))
(define profile-lock-file (define profile-lock-file
(cut string-append <> ".lock")) (cut string-append <> ".lock"))