ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

refresh: Repurpose '-L' for '--load-path'.

Browse source 
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.
This commit is contained in:
Ludovic Courtès 2022-06-19 15:28:19 +02:00
parent 2ccbf3a45c
commit bdf4221767
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/guix.texi
View file

@ -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}).

22
guix/scripts/refresh.scm
View file

@ -81,7 +81,10 @@ (define %options
(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 @@ (define %options
(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 @@ (define (show-help)
-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 @@ (define (show-help)
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"))