From patchwork Thu Apr 16 21:44:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 21304 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 2B20E27BBE4; Thu, 16 Apr 2020 22:45:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id AE19527BBE1 for ; Thu, 16 Apr 2020 22:45:16 +0100 (BST) Received: from localhost ([::1]:39700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPCJw-0005Q2-7u for patchwork@mira.cbaines.net; Thu, 16 Apr 2020 17:45:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41234) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPCJk-0005O2-2T for guix-patches@gnu.org; Thu, 16 Apr 2020 17:45:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPCJi-0002QH-Qm for guix-patches@gnu.org; Thu, 16 Apr 2020 17:45:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56180) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jPCJi-0002PG-KN for guix-patches@gnu.org; Thu, 16 Apr 2020 17:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jPCJi-0001gA-FK for guix-patches@gnu.org; Thu, 16 Apr 2020 17:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40674] [PATCH]: typos & small fixes in guix/ui.scm Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Apr 2020 21:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40674 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40674@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15870734606363 (code B ref -1); Thu, 16 Apr 2020 21:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Apr 2020 21:44:20 +0000 Received: from localhost ([127.0.0.1]:39490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPCJ2-0001eZ-2z for submit@debbugs.gnu.org; Thu, 16 Apr 2020 17:44:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:42993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPCIq-0001eI-GQ for submit@debbugs.gnu.org; Thu, 16 Apr 2020 17:44:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41132) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPCIp-000503-6r for guix-patches@gnu.org; Thu, 16 Apr 2020 17:44:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPCIn-00021d-1t for guix-patches@gnu.org; Thu, 16 Apr 2020 17:44:07 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:41857) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jPCIm-00020r-P9 for guix-patches@gnu.org; Thu, 16 Apr 2020 17:44:04 -0400 Received: by mail-wr1-x434.google.com with SMTP id h9so365099wrc.8 for ; Thu, 16 Apr 2020 14:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=YJVAt5W6WnZo8wtseYQXVkxM15J1HgXY8/0C7TVlEls=; b=mEgkPuzi0IQSQ17tDlOqH03RVc0Om5KBm6FeeiMo39Bkq4i9tdFWIzdN6dZrG9VVe1 MYHIYUYUTmJvjCF1Nn0vO8D+3Ti4TdsWXhmpKKMf3FHvXHrw+ar5X6bcXQFBJZu8fVBx sd3SgUYYoFf8+Atb9u7wl6za2408YJeahzOhTCr+xG26S7BkFVThByS9s0itLrh4sI4C mAoNy/u00yk8SdvXtrlLAVjEP/TddyYJP+nS3rmOyOX1idvwtDxOL5kPzrVF3yoFUZq6 A/0jRm2FGy+K4NgLGjRGOyKzBojjmqGn1Tv0nRMDfxSo/Z/UidcWmiyDWhsAAgfYqXhm sNeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=YJVAt5W6WnZo8wtseYQXVkxM15J1HgXY8/0C7TVlEls=; b=r1HRqa4w450cmK+2qyoZJIj6au22Du7rXaFkyOcfe46moqxkLZsGmfkCRI4OUiOX1Q OPXcP0Gxt+S7PnuUIlKBPCudaIe/05aYfisAzWA6PnTm3aFbNsihvaNx5LuCYyc41XnM G4aVi9IRId2WKhWJxiPrnBoDCaAzxWI0MbNncest+HLoFgV6r17fF6U9iRxXbJkaluX+ IG1rEexGzGw3CngsCbrPVf4BeXwcMqI5wgdaJTPGSxO7TGeROimCijgBeVpATO0Ouf5n PuGqUVa+1VGFK4PhGYoV+GlEe0q+9JqsyGrCX5tVBigbQbhFkt3ob0rvlHt55usx7ZPo axwQ== X-Gm-Message-State: AGi0Puaq4yIOV6ICTo/ymNNTspVg68X19z2m4w8jcO+JXTmHDUca1x8N fVrQzoSYo9leVuJufPIRMuLtX5yq X-Google-Smtp-Source: APiQypLJ65htwhBTTdnUjzImo0kNyvOZCu2inOCFdnM4T71XramkVkurNgNfNbpSAGic+KXYF3t2UQ== X-Received: by 2002:a5d:65cb:: with SMTP id e11mr267042wrw.402.1587073443151; Thu, 16 Apr 2020 14:44:03 -0700 (PDT) Received: from [10.0.0.2] (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id s24sm5346622wmj.28.2020.04.16.14.44.01 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Apr 2020 14:44:02 -0700 (PDT) From: Vincent Legoll Message-ID: <8e729c60-13db-32d7-c96c-a2087c64ed62@gmail.com> Date: Thu, 16 Apr 2020 23:44:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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 Hello, here is a patch to fix a few fairly trivial things. I saw the first one (s/IDENT/INDENT/) reading a patch in the ML, and while I was in that file, searched for other ones. The line-length fix (1st hunk) may not be suitable... The grammar fix (last hunk) may not be a real english fix, dunno. Will this create merge conflicts for others ? WDYT ? From b1c5e90d85a15e87d075d2547c02bb49fe5a54a6 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Thu, 16 Apr 2020 23:17:16 +0200 Subject: [PATCH] guix: ui: Fix typos, 80-col & grammar in comments & docstrings * guix/ui.scm (load*): Fix comment line length. (leave-on-EPIPE): Fix typo in docstring. (substitutable-info): Fix typo in comment. (indented-string): Fix typo in docstring. (%package-metrics): Fix typo in comment. (run-guix): Fix grammar in docstring. --- guix/ui.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index 1ccc80a000..ea5f460865 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -234,8 +234,8 @@ information, or #f if it could not be found." ;; Give 'load' an absolute file name so that it doesn't try to ;; search for FILE in %LOAD-PATH. Note: use 'load', not - ;; 'primitive-load', so that FILE is compiled, which then allows us - ;; to provide better error reporting with source line numbers. + ;; 'primitive-load', so that FILE is compiled, which then allows + ;; us to provide better error reporting with source line numbers. (load (canonicalize-path file))) (const #f)))))) (lambda _ @@ -796,7 +796,7 @@ directories:~{ ~a~}~%") (apply format #f format-string format-args)))))) (define-syntax-rule (leave-on-EPIPE exp ...) - "Run EXP... in a context when EPIPE errors are caught and lead to 'exit' + "Run EXP... in a context where EPIPE errors are caught and lead to 'exit' with successful exit code. This is useful when writing to the standard output may lead to EPIPE, because the standard output is piped through 'head' or similar." @@ -925,7 +925,7 @@ download." drv)) (define substitutable-info - ;; Call 'substitutation-oracle' upfront so we don't end up launching the + ;; Call 'substitution-oracle' upfront so we don't end up launching the ;; substituter many times. This makes a big difference, especially when ;; DRV is a long list as is the case with 'guix environment'. (if use-substitutes? @@ -1251,7 +1251,7 @@ separator between subsequent columns." (define* (indented-string str indent #:key (initial-indent? #t)) - "Return STR with each newline preceded by IDENT spaces. When + "Return STR with each newline preceded by INDENT spaces. When INITIAL-INDENT? is true, the first line is also indented." (define indent-string (make-list indent #\space)) @@ -1534,7 +1534,7 @@ score, the more relevant OBJ is to REGEXPS." (,(lambda (package) (filter (lambda (output) (not (member output - ;; Some common outpus shared by many packages. + ;; Some common outputs shared by many packages. '("out" "doc" "debug" "lib" "include" "bin")))) (package-outputs package))) . 1) @@ -1942,7 +1942,7 @@ found." (define (run-guix . args) "Run the 'guix' command defined by command line ARGS. Unlike 'guix-main', this procedure assumes that locale, i18n support, -and signal handling has already been set up." +and signal handling have already been set up." (define option? (cut string-prefix? "-" <>)) ;; The default %LOAD-EXTENSIONS includes the empty string, which doubles the -- 2.26.0