diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-11-29 15:11:51 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-11-29 15:54:20 +0100 |
| commit | 3f8e890d91975a26ecb417e9115805159aa3170d (patch) | |
| tree | c06a128b872cd36da89006f3a1dbed8f352ebf06 /guix/build | |
| parent | 55e1dfa4dd189e010c541e3997b65434c702b4a5 (diff) | |
| download | guix-patches-3f8e890d91975a26ecb417e9115805159aa3170d.tar guix-patches-3f8e890d91975a26ecb417e9115805159aa3170d.tar.gz | |
ui: 'with-profile-lock' keeps going upon ENOLCK.
* 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.
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/syscalls.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index a5a9c92a42..ce7999b433 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -1127,7 +1127,9 @@ exception if it's already taken." (lambda (key . args) (match key ('flock-error - (handler args)) + (apply handler args) + ;; No open port to the lock, so return #f. + #f) ('system-error ;; When using the statically-linked Guile in the initrd, ;; 'fcntl-flock' returns ENOSYS unconditionally. Ignore |