From patchwork Thu Nov 21 15:03:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 16178 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1E1DE177A1; Thu, 21 Nov 2019 15:05:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D82251779F for ; Thu, 21 Nov 2019 15:05:29 +0000 (GMT) Received: from localhost ([::1]:41658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXo1R-000848-6h for patchwork@mira.cbaines.net; Thu, 21 Nov 2019 10:05:29 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#38312] [PATCH 3/3] guix build: '--keep-failed' implies '--no-offload'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Nov 2019 15:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38312 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38312@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 38312-submit@debbugs.gnu.org id=B38312.15743486757553 (code B ref 38312); Thu, 21 Nov 2019 15:05:03 +0000 Received: (at 38312) by debbugs.gnu.org; 21 Nov 2019 15:04:35 +0000 Received: from localhost ([127.0.0.1]:53195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iXo0W-0001xj-C8 for submit@debbugs.gnu.org; Thu, 21 Nov 2019 10:04:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iXo0P-0001xF-Fc for 38312@debbugs.gnu.org; Thu, 21 Nov 2019 10:04:28 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iXo0K-00040t-Bj; Thu, 21 Nov 2019 10:04:20 -0500 Received: from wifi-eduroam-20-234.siege.inria.fr ([128.93.20.234]:46490 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iXo0H-0004tx-5D; Thu, 21 Nov 2019 10:04:19 -0500 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> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191121150358.21044-1-ludo@gnu.org> References: <20191121150358.21044-1-ludo@gnu.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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?)