From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gG0GFuMlxF8UcwAA0tVLHw (envelope-from ) for ; Sun, 29 Nov 2020 22:51:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id MITQEeMlxF/wMwAAbx9fmQ (envelope-from ) for ; Sun, 29 Nov 2020 22:51:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E93009403EC for ; Sun, 29 Nov 2020 22:51:14 +0000 (UTC) Received: from localhost ([::1]:39656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjVXF-0003rh-Sn for larch@yhetil.org; Sun, 29 Nov 2020 17:51:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjVX4-0003m8-T0 for guix-patches@gnu.org; Sun, 29 Nov 2020 17:51:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjVX4-00036k-MO for guix-patches@gnu.org; Sun, 29 Nov 2020 17:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjVX4-0002v6-LT for guix-patches@gnu.org; Sun, 29 Nov 2020 17:51:02 -0500 Subject: bug#44460: Add copyright lines Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 29 Nov 2020 22:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 44460 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: John Soo Cc: 44460-done@debbugs.gnu.org Mail-Followup-To: 44460@debbugs.gnu.org, ludo@gnu.org, jsoo1@asu.edu Received: via spool by 44460-done@debbugs.gnu.org id=D44460.160669020611151 (code D ref 44460); Sun, 29 Nov 2020 22:51:02 +0000 Received: (at 44460-done) by debbugs.gnu.org; 29 Nov 2020 22:50:06 +0000 Received: from localhost ([127.0.0.1]:52895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjVW9-0002tm-Jq for submit@debbugs.gnu.org; Sun, 29 Nov 2020 17:50:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjVW7-0002tC-Ra for 44460-done@debbugs.gnu.org; Sun, 29 Nov 2020 17:50:04 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42569) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjVW2-0002cR-GN; Sun, 29 Nov 2020 17:49:58 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=56734 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kjVW2-0007BE-0i; Sun, 29 Nov 2020 17:49:58 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87o8kcv30a.fsf@asu.edu> <878sbeoya2.fsf@asu.edu> <87k0usn9jk.fsf@gnu.org> <87imabok8j.fsf@asu.edu> <87ft5elu45.fsf@gnu.org> <87361eoabg.fsf@asu.edu> <871rgyiajk.fsf@gnu.org> <87pn4hn7lr.fsf@asu.edu> <87eekxxmee.fsf@asu.edu> Date: Sun, 29 Nov 2020 23:49:56 +0100 In-Reply-To: <87eekxxmee.fsf@asu.edu> (John Soo's message of "Fri, 13 Nov 2020 08:16:25 -0800") Message-ID: <87wny3ok17.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.21 X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-TUID: eEBgSxUwUcKK --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, John Soo skribis: >>>From 6082c559d1200e632b3fb45eb0633d28829667a1 Mon Sep 17 00:00:00 2001 > From: John Soo > Date: Thu, 12 Nov 2020 21:16:48 -0800 > Subject: [PATCH 1/2] processes: Put ChildProcess and ChildPID on separate > lines. > > * guix/scripts/processes.scm: Put child process information in > separate fields. > * doc/guix.texi: Document change in output of guix processes. Applied. >>>From becf3a8fee4aea0a49dde47f5728410b97d94fbf Mon Sep 17 00:00:00 2001 > From: John Soo > Date: Wed, 4 Nov 2020 07:51:52 -0800 > Subject: [PATCH 2/2] processes: Optionally normalize recutils output. > > * guix/scripts/processes.scm: Add "format" and "list-formats" flag. > * doc/guix.texi: Document new flags. Applied with the changes below. I also tweaked the commit logs to list the entities added or modified. Thanks! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/doc/guix.texi b/doc/guix.texi index b739464853..fcaa2f2b63 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12884,14 +12884,15 @@ Produce output in the specified @var{format}, one of: @table @code @item recutils The default option. It outputs a set of Session recutils records -that include each ChildProcess as a field. +that include each @code{ChildProcess} as a field. @item normalized Normalize the output records into record sets (@pxref{Record Sets,,, recutils, GNU recutils manual}). Normalizing into record sets allows joins across record types. The example below lists the PID of each -ChildProcess and the associated PID for Session that spawned the -ChildProcess where the Session was started using guix build. +@code{ChildProcess} and the associated PID for @code{Session} that +spawned the @code{ChildProcess} where the @code{Session} was started +using @command{guix build}. @example $ guix processes --format=normalized | \ @@ -12899,7 +12900,7 @@ $ guix processes --format=normalized | \ -j Session \ -t ChildProcess \ -p Session.PID,PID \ - -e 'Session.ClientCommand ~ "guix build'" + -e 'Session.ClientCommand ~ "guix build"' PID: 4435 Session_PID: 4278 diff --git a/guix/scripts/processes.scm b/guix/scripts/processes.scm index bcc541badb..87e687852c 100644 --- a/guix/scripts/processes.scm +++ b/guix/scripts/processes.scm @@ -338,8 +338,10 @@ List the current Guix sessions and their processes.")) (define-command (guix-processes . args) (category plumbing) (synopsis "list currently running sessions") + (define options - (parse-command-line args %options (list %default-options))) + (parse-command-line args %options (list %default-options) + #:build-options? #f)) (with-paginated-output-port port (match (assoc-ref options 'format) --=-=-=--