diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-01-29 09:22:44 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-08-17 12:09:23 +0200 |
| commit | 907c21f76140fb0687ddc2e1d72c6eddd00061ab (patch) | |
| tree | 3f31aaa7ef3ddb2f36bcfc8eb8947753854f78cc | |
| parent | e11f17226522f6b7c347f8001a50a734d6c5df76 (diff) | |
| download | cuirass-907c21f76140fb0687ddc2e1d72c6eddd00061ab.tar cuirass-907c21f76140fb0687ddc2e1d72c6eddd00061ab.tar.gz | |
base: Use the new 'store-error' procedure names.
The 'nix-error' names are now deprecated in Guix.
* src/cuirass/base.scm (build-derivations&): Use the new 'store-error'
procedure names.
| -rw-r--r-- | src/cuirass/base.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm index c7447fa..2c568c9 100644 --- a/src/cuirass/base.scm +++ b/src/cuirass/base.scm @@ -1,5 +1,5 @@ ;;; base.scm -- Cuirass base module -;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> @@ -375,7 +375,7 @@ Essentially this procedure inverts the inversion-of-control that (lambda () (catch #t (lambda () - (guard (c ((nix-error? c) + (guard (c ((store-error? c) (close-port output) (atomic-box-set! result c))) (parameterize ((current-build-output-port output)) @@ -467,11 +467,11 @@ items." (if (> count max-batch-size) (split-at drv max-batch-size) (values drv '())))) - (guard (c ((nix-protocol-error? c) + (guard (c ((store-protocol-error? c) (log-message "batch of builds (partially) failed: \ ~a (status: ~a)" - (nix-protocol-error-message c) - (nix-protocol-error-status c)))) + (store-protocol-error-message c) + (store-protocol-error-status c)))) (log-message "building batch of ~a derivations (~a/~a)" max-batch-size (- total count) total) (let-values (((port finish) |