[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Ludovic Courtès |
|
Date: |
Sat, 17 Aug 2019 13:09:25 -0400 (EDT) |
branch: master
commit 907c21f76140fb0687ddc2e1d72c6eddd00061ab
Author: Ludovic Courtès <address@hidden>
Date: Tue Jan 29 09:22:44 2019 +0100
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.
---
src/cuirass/base.scm | 10 +++++-----
1 file 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 <address@hidden>
+;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <address@hidden>
;;; Copyright © 2016, 2017 Mathieu Lirzin <address@hidden>
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
@@ -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)