diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-02-05 10:51:23 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-02-05 12:03:25 +0100 |
| commit | c7465dcb96e8d35fb992f4e14c4e22251b951a98 (patch) | |
| tree | b7ee5a3b498ae3a0b4f2e9269d5459fab3d7ad1b | |
| parent | f5fdc54d3a0845d0590c181d3bd6016f22765431 (diff) | |
| download | guix-c7465dcb96e8d35fb992f4e14c4e22251b951a98.tar guix-c7465dcb96e8d35fb992f4e14c4e22251b951a98.tar.gz | |
status: Use 'define-immutable-record-type' and its functional setters.
* guix/status.scm (<build>): Define using
'define-immutable-record-type', and add 'set-build-completion' binding.
(update-build)[set-completion]: Remove.
Use 'set-build-completion' instead.
| -rw-r--r-- | guix/status.scm | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/guix/status.scm b/guix/status.scm index bd382baf7a..070071d46f 100644 --- a/guix/status.scm +++ b/guix/status.scm @@ -30,6 +30,7 @@ #:use-module (guix memoization) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) + #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) #:use-module (ice-9 regex) @@ -100,14 +101,15 @@ (default '()))) ;; On-going or completed build. -(define-record-type <build> +(define-immutable-record-type <build> (%build derivation id system log-file completion) build? (derivation build-derivation) ;string (.drv file name) (id build-id) ;#f | integer (system build-system) ;string (log-file build-log-file) ;#f | string - (completion build-completion)) ;#f | integer (percentage) + (completion build-completion ;#f | integer (percentage) + set-build-completion)) (define* (build derivation system #:key id log-file completion) "Return a new build." @@ -156,13 +158,6 @@ (define (update-build status id line) "Update STATUS based on LINE, a build output line for ID that might contain a completion indication." - (define (set-completion b %) - (build (build-derivation b) - (build-system b) - #:id (build-id b) - #:log-file (build-log-file b) - #:completion %)) - (define (find-build) (find (lambda (build) (and (build-id build) @@ -173,7 +168,7 @@ a completion indication." (let ((build (find-build))) (build-status (inherit status) - (building (cons (set-completion build %) + (building (cons (set-build-completion build %) (delq build (build-status-building status))))))) (cond ((string-any #\nul line) |