From: "Ludovic Courtès" <ludo@gnu.org>
To: 38312@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#38312] [PATCH 3/3] guix build: '--keep-failed' implies '--no-offload'.
Date: Thu, 21 Nov 2019 16:03:58 +0100 [thread overview]
Message-ID: <20191121150358.21044-2-ludo@gnu.org> (raw)
In-Reply-To: <20191121150358.21044-1-ludo@gnu.org>
* guix/scripts/build.scm (set-build-options-from-command-line): Pass
#:offload? #f when 'keep-failed? is true.
* doc/guix.texi (Common Build Options): Document it.
---
doc/guix.texi | 6 +++---
guix/scripts/build.scm | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index b1c615235b..e57c12ab7f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -8048,9 +8048,9 @@ the end of the build log. This is useful when debugging build issues.
@xref{Debugging Build Failures}, for tips and tricks on how to debug
build issues.
-This option has no effect when connecting to a remote daemon with a
-@code{guix://} URI (@pxref{The Store, the @code{GUIX_DAEMON_SOCKET}
-variable}).
+This option implies @option{--no-offload}, and it has no effect when
+connecting to a remote daemon with a @code{guix://} URI (@pxref{The
+Store, the @code{GUIX_DAEMON_SOCKET} variable}).
@item --keep-going
@itemx -k
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index acb495a462..a853ac6c7d 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -545,7 +545,8 @@ talking to a remote daemon\n")))
#:fallback? (assoc-ref opts 'fallback?)
#:use-substitutes? (assoc-ref opts 'substitutes?)
#:substitute-urls (assoc-ref opts 'substitute-urls)
- #:offload? (assoc-ref opts 'offload?)
+ #:offload? (and (assoc-ref opts 'offload?)
+ (not (assoc-ref opts 'keep-failed?)))
#:max-silent-time (assoc-ref opts 'max-silent-time)
#:timeout (assoc-ref opts 'timeout)
#:print-build-trace (assoc-ref opts 'print-build-trace?)
--
2.24.0
next prev parent reply other threads:[~2019-11-21 15:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 14:58 [bug#38312] [PATCH 1/3] guix build, daemon: Rename "--no-build-hook" to "--no-offload" Ludovic Courtès
2019-11-21 15:03 ` [bug#38312] [PATCH 2/3] Use 'offload?' instead of 'build-hook?' internally Ludovic Courtès
2019-11-21 15:03 ` Ludovic Courtès [this message]
2019-11-21 16:54 ` [bug#38312] [PATCH 3/3] guix build: '--keep-failed' implies '--no-offload' Carl Dong
2019-11-21 18:26 ` Ludovic Courtès
2019-11-25 23:19 ` bug#38312: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191121150358.21044-2-ludo@gnu.org \
--to=ludo@gnu.org \
--cc=38312@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).