emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[debbugs-tracker] bug#33454: closed ([PATCH] describe: Add profile optio


From: GNU bug Tracking System
Subject: [debbugs-tracker] bug#33454: closed ([PATCH] describe: Add profile option.)
Date: Tue, 27 Nov 2018 17:15:03 +0000

Your message dated Tue, 27 Nov 2018 20:13:50 +0300
with message-id <address@hidden>
and subject line Re: [bug#33454] [PATCH] describe: Delete directory argument 
from 'display-checkout-info'.
has caused the debbugs.gnu.org bug report #33454,
regarding [PATCH] describe: Add profile option.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
33454: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=33454
GNU Bug Tracking System
Contact address@hidden with problems
--- Begin Message --- 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
+
address@hidden address@hidden
address@hidden -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




--- End Message ---
--- Begin Message --- Subject: Re: [bug#33454] [PATCH] describe: Delete directory argument from 'display-checkout-info'. Date: Tue, 27 Nov 2018 20:13:50 +0300 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)
address@hidden (Ludovic Court├Ęs) writes:

> Oleg Pykhalov <address@hidden> 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.

Attachment: signature.asc
Description: PGP signature


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]