summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludovic.courtes@inria.fr>2019-10-24 18:15:15 +0200
committerLudovic Courtès <ludo@gnu.org>2019-10-25 12:13:00 +0200
commitb3673e9917217fc27c743092e58e4eb33d0fdd16 (patch)
tree3b3b0f3fd7c98e64d7f75527af3cfbbe77f67172
parent258e63bfb43c0b1f5d66794a6a00dc5936ac33c1 (diff)
guix build: Warn when '--keep-failed' is passed to a remote daemon.
* guix/scripts/build.scm (set-build-options-from-command-line): When OPTS has 'keep-failed?' set, check whether STORE is connected over AF_UNIX and warn when it's not.
-rw-r--r--guix/scripts/build.scm14
1 files changed, 14 insertions, 0 deletions
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 3ee0b737fe..ee1a9a81c1 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -523,6 +523,20 @@ options handled by 'set-build-options-from-command-line', and listed in
"Given OPTS, an alist as returned by 'args-fold' given
'%standard-build-options', set the corresponding build options on STORE."
;; TODO: Add more options.
+
+ ;; '--keep-failed' has no effect when talking to a remote daemon. Catch the
+ ;; case where GUIX_DAEMON_SOCKET=guix://….
+ (when (and (assoc-ref opts 'keep-failed?)
+ (let* ((socket (store-connection-socket store))
+ (peer (catch 'system-error
+ (lambda ()
+ (and (file-port? socket)
+ (getpeername socket)))
+ (const #f))))
+ (and peer (not (= AF_UNIX (sockaddr:fam peer))))))
+ (warning (G_ "'--keep-failed' ignored since you are \
+talking to a remote daemon\n")))
+
(set-build-options store
#:keep-failed? (assoc-ref opts 'keep-failed?)
#:keep-going? (assoc-ref opts 'keep-going?)