From: Oleg Pykhalov <go.wigust@gmail.com>
To: 33454@debbugs.gnu.org
Subject: [bug#33454] [PATCH] describe: Add profile option.
Date: Wed, 21 Nov 2018 11:59:59 +0300 [thread overview]
Message-ID: <20181121085959.31035-1-go.wigust@gmail.com> (raw)
* 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
next reply other threads:[~2018-11-21 9:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-21 8:59 Oleg Pykhalov [this message]
2018-11-21 9:40 ` [bug#33454] [PATCH] describe: Add profile option Ludovic Courtès
2018-11-21 11:48 ` Oleg Pykhalov
2018-11-21 14:27 ` [bug#33454] [PATCH] describe: Delete directory argument from 'display-checkout-info' Oleg Pykhalov
2018-11-27 10:25 ` Ludovic Courtès
2018-11-27 17:13 ` Oleg Pykhalov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181121085959.31035-1-go.wigust@gmail.com \
--to=go.wigust@gmail.com \
--cc=33454@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.