futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts: Use 'args-fold*' for command that do not honor build flags.

Browse Source 
Fixes <https://bugs.gnu.org/28984>.
Reported by Eric Bavier.

* guix/scripts/challenge.scm (guix-challenge): Use 'args-fold*' instead
of 'parse-command-line'.
* guix/scripts/size.scm (guix-size): Likewise.
* guix/scripts/weather.scm (guix-weather): Likewise.
This commit is contained in:
Ludovic Courtès 2017-10-27 13:11:26 -07:00
parent 50942a690e
commit efff3dd4c9
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/scripts/challenge.scm
View File

@ -278,7 +278,12 @@ Challenge the substitutes for PACKAGE... provided by one or more servers.\n"))
(define (guix-challenge . args) (define (guix-challenge . args)
(with-error-handling (with-error-handling
(let* ((opts (parse-command-line args %options (list %default-options))) (let* ((opts (args-fold* args %options
(lambda (opt name arg . rest)
(leave (G_ "~A: unrecognized option~%") name))
(lambda (arg result)
(alist-cons 'argument arg result))
%default-options))
(files (filter-map (match-lambda (files (filter-map (match-lambda
(('argument . file) file) (('argument . file) file)
(_ #f)) (_ #f))

7
guix/scripts/size.scm
View File

@ -291,7 +291,12 @@ Report the size of PACKAGE and its dependencies.\n"))
(define (guix-size . args) (define (guix-size . args)
(with-error-handling (with-error-handling
(let* ((opts (parse-command-line args %options (list %default-options))) (let* ((opts (args-fold* args %options
(lambda (opt name arg . rest)
(leave (G_ "~A: unrecognized option~%") name))
(lambda (arg result)
(alist-cons 'argument arg result))
%default-options))
(files (filter-map (match-lambda (files (filter-map (match-lambda
(('argument . file) file) (('argument . file) file)
(_ #f)) (_ #f))

8
guix/scripts/weather.scm
View File

@ -204,8 +204,12 @@ Report the availability of substitutes.\n"))
(define (guix-weather . args) (define (guix-weather . args)
(with-error-handling (with-error-handling
(let* ((opts (parse-command-line args %options (let* ((opts (args-fold* args %options
(list %default-options))) (lambda (opt name arg . rest)
(leave (G_ "~A: unrecognized option~%") name))
(lambda (arg result)
(alist-cons 'argument arg result))
%default-options))
(urls (assoc-ref opts 'substitute-urls)) (urls (assoc-ref opts 'substitute-urls))
(systems (match (filter-map (match-lambda (systems (match (filter-map (match-lambda
(('system . system) system) (('system . system) system)