diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-09-20 17:51:39 +0900 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-20 23:22:42 +0900 |
| commit | e465d9e19087ab150f7e31f21c09e4a147b93b36 (patch) | |
| tree | 83562de5353e39d27afb7270b560428f5285a666 /guix/ui.scm | |
| parent | 232ccbefc05aa7fbd3ea8b8f71a65bafc178a28a (diff) | |
| download | guix-patches-e465d9e19087ab150f7e31f21c09e4a147b93b36.tar guix-patches-e465d9e19087ab150f7e31f21c09e4a147b93b36.tar.gz | |
ui: Do not shadow '_' where it's used as a literal syntax match.
Fixes compilation with Guile 2.1.
Reported by Mu Lei.
* guix/ui.scm (report-load-error)
(warn-about-load-error, read/eval-package-expression): Use 'rest'
instead of '_' as the pattern variable name.
* gnu/packages.scm (%find-package): Likewise.
* guix/scripts/build.scm (transform-package-inputs): Likewise.
* guix/scripts/hash.scm (guix-hash): Likewise.
* guix/scripts/import/gnu.scm (%options, guix-import-gnu): Likewise.
* guix/scripts/import/nix.scm (guix-import-nix): Likewise.
* guix/scripts/offload.scm (build-machines): Likewise.
* guix/scripts/refresh.scm (%options): Likewise.
* guix/scripts/substitute.scm (narinfo-signature->canonical-sexp):
Likewise.
Diffstat (limited to 'guix/ui.scm')
| -rw-r--r-- | guix/ui.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index 452d16308e..eb85df3b18 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -247,7 +247,7 @@ messages." "Report the failure to load FILE, a user-provided Scheme file. ARGS is the list of arguments received by the 'throw' handler." (match args - (('system-error . _) + (('system-error . rest) (let ((err (system-error-errno args))) (report-error (_ "failed to load '~a': ~a~%") file (strerror err)))) (('syntax-error proc message properties form . rest) @@ -264,7 +264,7 @@ ARGS is the list of arguments received by the 'throw' handler." "Report the failure to load FILE, a user-provided Scheme file, without exiting. ARGS is the list of arguments received by the 'throw' handler." (match args - (('system-error . _) + (('system-error . rest) (let ((err (system-error-errno args))) (warning (_ "failed to load '~a': ~a~%") file (strerror err)))) (('syntax-error proc message properties form . rest) @@ -409,7 +409,7 @@ interpreted." ("ZB" (expt 10 21)) ("YB" (expt 10 24)) ("" 1) - (_ + (x (leave (_ "unknown unit: ~a~%") unit))))))) (define (call-with-error-handling thunk) @@ -535,7 +535,7 @@ similar." error." (match (read/eval str) ((? package? p) p) - (_ + (x (leave (_ "expression ~s does not evaluate to a package~%") str)))) |