diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-07-10 19:58:30 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-11 23:13:26 +0200 |
commit | 5c3d44303e1bb75d45334af5cf86cde723da0371 (patch) | |
tree | c9827bb70c4d12c792bf24042a38ffdd36f879af /guix/ui.scm | |
parent | 878a6baa4c705f4d551b60c5aa254246e0abc922 (diff) | |
download | patches-5c3d44303e1bb75d45334af5cf86cde723da0371.tar patches-5c3d44303e1bb75d45334af5cf86cde723da0371.tar.gz |
guix gc: Correctly handle '--delete-generations' with no arguments.
Previously, 'guix gc --delete-generations' would crash: the "" pattern
would be passed to 'matching-generations', which would return #f instead
of returning a list.
Reported by Raghav Gururajan <rvgn@disroot.org>
in <https://bugs.gnu.org/36466>.
* guix/ui.scm (matching-generations): Raise an error when passed an
invalid pattern.
* guix/scripts/gc.scm (delete-old-generations): Check if PATTERN is
true.
(%options): Leave ARG as-is for 'delete-generations'.
(guix-gc): Use 'assq' instead of 'assoc-ref' for 'delete-generations'.
* guix/scripts/package.scm (delete-matching-generations):
Replace (string-null? pattern) with (not pattern). Remove 'else'
clause.
(%options): Leave ARG as-is for 'delete-generations'.
* guix/scripts/pull.scm (%options): Leave ARG as-is for
'list-generations'.
(process-query): Replace (string-null? pattern) with (not pattern).
* guix/scripts/system.scm (list-generations): Likewise, and remove
'else' clause.
(process-command): Use #f instead of "" when no pattern is given.
Diffstat (limited to 'guix/ui.scm')
-rw-r--r-- | guix/ui.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index 7d6ab9a2a7..76f6fc8eed 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1484,7 +1484,11 @@ DURATION-RELATION with the current time." ((string->duration str) => filter-by-duration) - (else #f))) + (else + (raise + (condition (&message + (message (format #f (G_ "invalid syntax: ~a~%") + str)))))))) (define (display-generation profile number) "Display a one-line summary of generation NUMBER of PROFILE." |