Received: (at submit) by debbugs.gnu.org; 19 Jun 2022 13:55:38 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jun 19 09:55:38 2022 Received: from localhost ([127.0.0.1]:52547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1o2vOr-0000a4-KK for submit <at> debbugs.gnu.org; Sun, 19 Jun 2022 09:55:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:59354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1o2vOp-0000YW-Iz for submit <at> debbugs.gnu.org; Sun, 19 Jun 2022 09:55:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1o2vOp-00060k-BS for guix-patches@HIDDEN; Sun, 19 Jun 2022 09:55:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:56976) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1o2vOo-0003fc-5A; Sun, 19 Jun 2022 09:55:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=4M8YpumkGOTlSkp1aJD4GnbVgW6Qe9qWE7dQbL1Tg/M=; b=ZS4ZSdpgFWdT3z OjY63xnlU0GslGYCKwkki2eWUjuEl05K5EmXoPX7jFAwsdBv7YwlJtkiuxZQWyG7xiB+KVghwi92z 2J6+KV6Tf0SkH6+hBSaTmOt8QRbEPAAo7sIp0JbC9HCTW7RvQvsN9k9lBwdg68EGA9zUzRiUkRx9T jcfkvecMTSMTSqZnkaDMdqPQXSiQBUAiDcBdSD6EDMI7s/hrdY9kkqMKAqzWK2mWZw1+M1D5Wm+lw gEF2CayHQmhpBnVBcEWfUWuDYor93qVUu38TNxSVEX/E7Mn9NQ+8CzWVgcx/yq2tr+jmPuPlIPdZO jUH6PKdBeB/6gFdZW+wQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:51218 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1o2vOn-00064O-LA; Sun, 19 Jun 2022 09:55:33 -0400 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH] challenge: Do nothing when passed zero arguments. Date: Sun, 19 Jun 2022 15:55:22 +0200 Message-Id: <20220619135522.4442-1-ludo@HIDDEN> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@HIDDEN>, Vagrant Cascadian <vagrant@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Previously, 'guix challenge' without arguments would list live store items that had been locally built. This was deemed confusing, especially since 'list-live' is an expensive operation. * guix/scripts/challenge.scm (guix-challenge): Warn and exit with 0 when FILES is empty. * doc/guix.texi (Invoking guix challenge): Update accordingly. --- doc/guix.texi | 38 ++++++++++++++++++++++---------------- guix/scripts/challenge.scm | 5 +++-- 2 files changed, 25 insertions(+), 18 deletions(-) Hi! This changes ‘guix challenge’ such that, with no arguments, it does nothing, which is arguably less confusing that the current behavior. Thoughts? Ludo’. diff --git a/doc/guix.texi b/doc/guix.texi index 86348fc02c..75b8eca38d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14911,7 +14911,9 @@ any given store item. The command output looks like this: @smallexample -$ guix challenge --substitute-urls="https://@value{SUBSTITUTE-SERVER-1} https://guix.example.org" +$ guix challenge \ + --substitute-urls="https://@value{SUBSTITUTE-SERVER-1} https://guix.example.org" \ + openssl git pius coreutils grep updating list of substitutes from 'https://@value{SUBSTITUTE-SERVER-1}'... 100.0% updating list of substitutes from 'https://guix.example.org'... 100.0% /gnu/store/@dots{}-openssl-1.0.2d contents differ: @@ -14938,18 +14940,20 @@ updating list of substitutes from 'https://guix.example.org'... 100.0% @dots{} -6,406 store items were analyzed: - - 4,749 (74.1%) were identical - - 525 (8.2%) differed - - 1,132 (17.7%) were inconclusive +5 store items were analyzed: + - 2 (40.0%) were identical + - 3 (60.0%) differed + - 0 (0.0%) were inconclusive @end smallexample @noindent -In this example, @command{guix challenge} first scans the store to -determine the set of locally-built derivations---as opposed to store -items that were downloaded from a substitute server---and then queries -all the substitute servers. It then reports those store items for which -the servers obtained a result different from the local build. +In this example, @command{guix challenge} queries all the substitute +servers for each of the fives packages specified on the command line. +It then reports those store items for which the servers obtained a +result different from the local build (if it exists) and/or different +from one another; here, the @samp{local hash} lines indicate that a +local build result was available for each of these packages and shows +its hash. @cindex non-determinism, in package builds As an example, @code{guix.example.org} always gets a different answer. @@ -15005,19 +15009,21 @@ whether @code{@value{SUBSTITUTE-SERVER-1}} and other substitute servers obtain t same build result as you did with: @example -$ guix challenge @var{package} +guix challenge @var{package} @end example -@noindent -where @var{package} is a package specification such as -@code{guile@@2.0} or @code{glibc:debug}. - The general syntax is: @example -guix challenge @var{options} [@var{packages}@dots{}] +guix challenge @var{options} @var{argument}@dots{} @end example +@noindent +where @var{argument} is a package specification such as +@code{guile@@2.0} or @code{glibc:debug} or, alternatively, a store file +name as returned, for example, by @command{guix build} or @command{guix +gc --list-live}. + When a difference is found between the hash of a locally-built item and that of a server-provided substitute, or among substitutes provided by different servers, the command displays it as in the example above and diff --git a/guix/scripts/challenge.scm b/guix/scripts/challenge.scm index 96ffe53a85..1fdf245505 100644 --- a/guix/scripts/challenge.scm +++ b/guix/scripts/challenge.scm @@ -530,8 +530,9 @@ (define-command (guix-challenge . args) (current-terminal-columns (terminal-columns))) (let ((files (match files (() - (filter (cut locally-built? store <>) - (live-paths store))) + (warning + (G_ "no arguments specified, nothing to do~%")) + (exit 0)) (x files)))) (set-build-options store base-commit: 7f208f68dea828fe02718ca8ce81d5975136cff8 -- 2.36.1
Ludovic Courtès <ludo@HIDDEN>
:guix-patches@HIDDEN
.
Full text available.guix-patches@HIDDEN
:bug#56092
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.