From 47960b55268220ca1cb7d2fed41c53873181d816 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 16 Mar 2022 15:03:01 +0100 Subject: system: Improve 'read-boot-parameters' incompatibility diagnostic. Previously, when reading an incompatible "parameters" file, 'guix system' would print a warning and then crash with a wrong-type-arg backtrace because code expects 'read-boot-parameters' to always return a record. * gnu/system.scm (read-boot-parameters): Upon incompatibility, raise an error instead of returning #f. Also raise a '&fix-hint' condition. * tests/boot-parameters.scm ("read, construction, mandatory fields"): Define 'test-read-boot-parameters' as a macro; expect 'formatted-message?' exceptions rather than #f returns. --- gnu/system.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/system.scm b/gnu/system.scm index dc980312ab..59b3dea93c 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -354,7 +354,7 @@ file system labels." (define (read-boot-parameters port) "Read boot parameters from PORT and return the corresponding - object or #f if the format is unrecognized." + object. Raise an error if the format is unrecognized." (define device-sexp->device (match-lambda (('uuid (? symbol? type) (? bytevector? bv)) @@ -481,9 +481,20 @@ file system labels." (_ ;the old format "/"))))) (x ;unsupported format - (warning (G_ "unrecognized boot parameters at '~a'~%") - (port-filename port)) - #f))) + (raise + (make-compound-condition + (formatted-message + (G_ "unrecognized boot parameters at '~a'~%") + (port-filename port)) + (condition + (&fix-hint (hint (format #f (G_ "This probably means that this version +of Guix is older than the one that created @file{~a}. To address this, you +need to update Guix: + +@example +guix pull +@end example") + (port-filename port)))))))))) (define (read-boot-parameters-file system) "Read boot parameters from SYSTEM's (system or generation) \"parameters\" -- cgit v1.2.3