GNU bug report logs - #33454
[PATCH] describe: Add profile option.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 33454 in the body.
You can then email your comments to 33454 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH] describe: Add profile option.
Date: Wed, 21 Nov 2018 11:59:59 +0300

* guix/scripts/describe.scm (%options): Add profile option.
(show-help): Document this.
(display-checkout-info): Check for profile argument.
* doc/guix.texi (Invoking guix describe): Document this.
---
 doc/guix.texi             |  4 ++++
 guix/scripts/describe.scm | 15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 3e7b0a9f4..274d4dfd1 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3278,6 +3278,10 @@ guix pull});
 @cindex JSON
 produce a list of channel specifications in JSON format.
 @end table
+
+@item --profile=@var{profile}
+@itemx -p @var{profile}
+Display information in the given @var{profile}.
 @end table
 
 @node Invoking guix pack
diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index 53195b423..251be8c21 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -42,6 +42,10 @@
                   (unless (member arg '("human" "channels" "json"))
                     (leave (G_ "~a: unsupported output format~%") arg))
                   (alist-cons 'format (string->symbol arg) result)))
+        (option '(#\p "profile") #t #f
+                (lambda (opt name arg result)
+                  (alist-cons 'profile (canonicalize-profile arg)
+                              result)))
         (option '(#\h "help") #f #f
                 (lambda args
                   (show-help)
@@ -59,6 +63,8 @@
 Display information about the channels currently in use.\n"))
   (display (G_ "
   -f, --format=FORMAT    display information in the given FORMAT"))
+  (display (G_ "
+  -p, --profile=PROFILE  display information in the given PROFILE"))
   (newline)
   (display (G_ "
   -h, --help             display this help and exit"))
@@ -79,11 +85,11 @@ Display information about the channels currently in use.\n"))
         (format #t (G_ "~%;; warning: GUIX_PACKAGE_PATH=\"~a\"~%")
                 string))))))
 
-(define (display-checkout-info fmt)
+(define* (display-checkout-info fmt #:optional directory)
   "Display information about the current checkout according to FMT, a symbol
 denoting the requested format.  Exit if the current directory does not lie
 within a Git checkout."
-  (let* ((program    (car (command-line)))
+  (let* ((program    (or directory (car (command-line))))
          (directory  (catch 'git-error
                        (lambda ()
                          (repository-discover (dirname program)))
@@ -171,9 +177,10 @@ in the format specified by FMT."
                                       name))
                              cons
                              %default-options))
-         (format (assq-ref opts 'format)))
+         (format (assq-ref opts 'format))
+         (profile (or (assq-ref opts 'profile) (current-profile))))
     (with-error-handling
-      (match (current-profile)
+      (match profile
         (#f
          (display-checkout-info format))
         (profile
-- 
2.19.1

Message #8 received at 33454 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Oleg Pykhalov <go.wigust <at> gmail.com>
Cc: 33454 <at> debbugs.gnu.org
Subject: Re: [bug#33454] [PATCH] describe: Add profile option.
Date: Wed, 21 Nov 2018 10:40:56 +0100

Hi Oleg,

Oleg Pykhalov <go.wigust <at> gmail.com> skribis:

> * guix/scripts/describe.scm (%options): Add profile option.
> (show-help): Document this.
> (display-checkout-info): Check for profile argument.
> * doc/guix.texi (Invoking guix describe): Document this.

Good idea!

> +@itemx -p @var{profile}
> +Display information in the given @var{profile}.

s/in the given/about/

> +  (display (G_ "
> +  -p, --profile=PROFILE  display information in the given PROFILE"))

Same here.

OK with these changes, thanks!

Ludo’.

Message #11 received at 33454 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: ludo <at> gnu.org (Ludovic Courtès)
Cc: 33454 <at> debbugs.gnu.org, 33454-done <at> debbugs.gnu.org
Subject: Re: [bug#33454] [PATCH] describe: Add profile option.
Date: Wed, 21 Nov 2018 14:48:12 +0300

[Message part 1 (text/plain, inline)]

Hi Ludovic,

ludo <at> gnu.org (Ludovic Courtès) writes:

[…]

> OK with these changes, thanks!

Thanks, applied with your suggestions as
1255400faabfcf0ca1666d17f2f34ea0d49f6b1f

Oleg.

[signature.asc (application/pgp-signature, inline)]

Message #19 received at 33454 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: 33454 <at> debbugs.gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH] describe: Delete directory argument from
 'display-checkout-info'.
Date: Wed, 21 Nov 2018 17:27:06 +0300

This commit is a following 1255400faabfcf0ca1666d17f2f34ea0d49f6b1f which
added unused optional 'directory' argument.

* guix/scripts/describe.scm (display-checkout-info): Delete directory
argument.
---
 guix/scripts/describe.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index d817d7f7c..761f212f0 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -84,11 +84,11 @@ Display information about the channels currently in use.\n"))
         (format #t (G_ "~%;; warning: GUIX_PACKAGE_PATH=\"~a\"~%")
                 string))))))
 
-(define* (display-checkout-info fmt #:optional directory)
+(define (display-checkout-info fmt)
   "Display information about the current checkout according to FMT, a symbol
 denoting the requested format.  Exit if the current directory does not lie
 within a Git checkout."
-  (let* ((program    (or directory (car (command-line))))
+  (let* ((program    (car (command-line)))
          (directory  (catch 'git-error
                        (lambda ()
                          (repository-discover (dirname program)))
-- 
2.19.1

Message #24 received at 33454 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Oleg Pykhalov <go.wigust <at> gmail.com>
Cc: 33454 <at> debbugs.gnu.org
Subject: Re: [bug#33454] [PATCH] describe: Delete directory argument from
 'display-checkout-info'.
Date: Tue, 27 Nov 2018 11:25:36 +0100

Oleg Pykhalov <go.wigust <at> gmail.com> skribis:

> This commit is a following 1255400faabfcf0ca1666d17f2f34ea0d49f6b1f which
> added unused optional 'directory' argument.
>
> * guix/scripts/describe.scm (display-checkout-info): Delete directory
> argument.

LGTM!  I had overlooked this…

Thanks,
Ludo’.

Message #27 received at 33454 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: ludo <at> gnu.org (Ludovic Courtès)
Cc: 33454 <at> debbugs.gnu.org, 33454-done <at> debbugs.gnu.org
Subject: Re: [bug#33454] [PATCH] describe: Delete directory argument from
 'display-checkout-info'.
Date: Tue, 27 Nov 2018 20:13:50 +0300

[Message part 1 (text/plain, inline)]

ludo <at> gnu.org (Ludovic Courtès) writes:

> Oleg Pykhalov <go.wigust <at> gmail.com> skribis:
>
>> This commit is a following 1255400faabfcf0ca1666d17f2f34ea0d49f6b1f which
>> added unused optional 'directory' argument.
>>
>> * guix/scripts/describe.scm (display-checkout-info): Delete directory
>> argument.
>
> LGTM!

OK, pushed as 01262f1ece37d5ae9af56c1de6c4eefc758f35ba

Thanks,
Oleg.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.