From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:46429) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXo1D-0007zQ-J6 for guix-patches@gnu.org; Thu, 21 Nov 2019 10:05:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXo1C-0004ni-GY for guix-patches@gnu.org; Thu, 21 Nov 2019 10:05:15 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44375) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iXo1C-0004nA-2z for guix-patches@gnu.org; Thu, 21 Nov 2019 10:05:14 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iXo11-0001yh-6e for guix-patches@gnu.org; Thu, 21 Nov 2019 10:05:13 -0500 Subject: [bug#38312] [PATCH 3/3] guix build: '--keep-failed' implies '--no-offload'. Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 21 Nov 2019 16:03:58 +0100 Message-Id: <20191121150358.21044-2-ludo@gnu.org> In-Reply-To: <20191121150358.21044-1-ludo@gnu.org> References: <20191121150358.21044-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38312@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= * 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