guix system: Type-check the file or expression.
Previously, users would get a wrong-type-arg exception down the road with an intimidating backtrace. * guix/scripts/system.scm (process-action)[ensure-operating-system]: New procedure. Use it.
This commit is contained in:
parent
6e633a510c
commit
ce10e6053b
|
@ -1143,12 +1143,20 @@ Some ACTIONS support additional ARGS.\n"))
|
|||
ACTION must be one of the sub-commands that takes an operating system
|
||||
declaration as an argument (a file name.) OPTS is the raw alist of options
|
||||
resulting from command-line parsing."
|
||||
(define (ensure-operating-system file-or-exp obj)
|
||||
(unless (operating-system? obj)
|
||||
(leave (G_ "'~a' does not return an operating system~%")
|
||||
file-or-exp))
|
||||
obj)
|
||||
|
||||
(let* ((file (match args
|
||||
(() #f)
|
||||
((x . _) x)))
|
||||
(expr (assoc-ref opts 'expression))
|
||||
(system (assoc-ref opts 'system))
|
||||
(os (cond
|
||||
(os (ensure-operating-system
|
||||
(or file expr)
|
||||
(cond
|
||||
((and expr file)
|
||||
(leave
|
||||
(G_ "both file and expression cannot be specified~%")))
|
||||
|
@ -1158,7 +1166,7 @@ resulting from command-line parsing."
|
|||
(load* file %user-module
|
||||
#:on-error (assoc-ref opts 'on-error)))
|
||||
(else
|
||||
(leave (G_ "no configuration specified~%")))))
|
||||
(leave (G_ "no configuration specified~%"))))))
|
||||
|
||||
(dry? (assoc-ref opts 'dry-run?))
|
||||
(bootloader? (assoc-ref opts 'install-bootloader?))
|
||||
|
|
Loading…
Reference in New Issue