[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/11: refresh: Repurpose '-L' for '--load-path'.
From: |
guix-commits |
Subject: |
10/11: refresh: Repurpose '-L' for '--load-path'. |
Date: |
Wed, 22 Jun 2022 17:50:17 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit bdf422176739b473add66eb8cac9fdd8c654f794
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Jun 19 15:28:19 2022 +0200
refresh: Repurpose '-L' for '--load-path'.
This incompatible change fixes an inconsistency with other commands
where '-L' is short for '--load-path'.
* guix/scripts/refresh.scm (%options): Add --load-path option from
%STANDARD-BUILD-OPTIONS. Remove #\L shortcut for --list-updaters, and
remove --load-path option that lacked the #\L shortcut.
(show-help): Update accordingly.
* doc/guix.texi (Invoking guix refresh): Update accordingly.
---
doc/guix.texi | 2 +-
guix/scripts/refresh.scm | 22 ++++++----------------
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 43a5fc85bd..bbb7d0764d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -13715,7 +13715,6 @@ gnu/packages/emacs.scm:856:13: emacs-auctex would be
upgraded from 11.88.6 to 11
@end example
@item --list-updaters
-@itemx -L
List available updaters and exit (see @option{--type} above).
For each updater, display the fraction of packages it covers; at the
@@ -13846,6 +13845,7 @@ the user whether to download it or not. This is the
default behavior.
Use @var{host} as the OpenPGP key server when importing a public key.
@item --load-path=@var{directory}
+@itemx -L @var{directory}
Add @var{directory} to the front of the package module search path
(@pxref{Package Modules}).
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index 4d52200b84..14329751f8 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -81,7 +81,10 @@
(names (map string->symbol
(string-tokenize arg not-comma))))
(alist-cons 'updaters names result))))
- (option '(#\L "list-updaters") #f #f
+ (find (lambda (option)
+ (member "load-path" (option-names option)))
+ %standard-build-options)
+ (option '("list-updaters") #f #f
(lambda args
(list-updaters-and-exit)))
(option '(#\m "manifest") #t #f
@@ -119,19 +122,6 @@
(leave (G_ "unsupported policy: ~a~%")
arg)))))
- ;; The short option -L is already used by --list-updaters, therefore
- ;; it needs to be removed from %standard-build-options.
- (let ((load-path-option (find (lambda (option)
- (member "load-path"
- (option-names option)))
- %standard-build-options)))
- (option
- (filter (lambda (name) (not (equal? #\L name)))
- (option-names load-path-option))
- (option-required-arg? load-path-option)
- (option-optional-arg? load-path-option)
- (option-processor load-path-option)))
-
(option '(#\h "help") #f #f
(lambda args
(show-help)
@@ -160,7 +150,7 @@ specified with `--select'.\n"))
-t, --type=UPDATER,... restrict to updates from the specified updaters
(e.g., 'gnu')"))
(display (G_ "
- -L, --list-updaters list available updaters and exit"))
+ --list-updaters list available updaters and exit"))
(display (G_ "
-l, --list-dependent list top-level dependent packages that would need to
be rebuilt as a result of upgrading PACKAGE..."))
@@ -182,7 +172,7 @@ specified with `--select'.\n"))
used when 'key-download' is not specified"))
(newline)
(display (G_ "
- --load-path=DIR prepend DIR to the package module search path"))
+ -L, --load-path=DIR prepend DIR to the package module search path"))
(newline)
(display (G_ "
-h, --help display this help and exit"))
- branch master updated (4f9ac2afc7 -> 2873433c72), guix-commits, 2022/06/22
- 01/11: services: wireguard: Shepherd 'stop' method really stops., guix-commits, 2022/06/22
- 03/11: gnu: sent: Add farbfeld to propagated-inputs., guix-commits, 2022/06/22
- 02/11: gnu: Add farbfeld., guix-commits, 2022/06/22
- 09/11: style: Keep values next to their keyword., guix-commits, 2022/06/22
- 08/11: gnu: libjxl: Update to 0.6.1-0.b7076f18., guix-commits, 2022/06/22
- 10/11: refresh: Repurpose '-L' for '--load-path'.,
guix-commits <=
- 05/11: gnu: sent: Remove input labels., guix-commits, 2022/06/22
- 04/11: gnu: sent: Apply guix style, guix-commits, 2022/06/22
- 11/11: news: Add entry for 'guix refresh -L' change., guix-commits, 2022/06/22
- 07/11: gnu: google-highway: Update to 0.17.0., guix-commits, 2022/06/22
- 06/11: gnu: reuse: Update to 1.0.0., guix-commits, 2022/06/22