diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-11-20 11:23:58 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-11-20 11:23:58 +0000 |
| commit | 68ea8bb49888a616a0a62652e546f2c4fb68089e (patch) | |
| tree | 10e7c14a432935ecf82ac63a37a16691a3385930 | |
| parent | 076683555911dcd71f9d2fb8971a01dfe4ec8ab5 (diff) | |
| download | build-coordinator-68ea8bb49888a616a0a62652e546f2c4fb68089e.tar build-coordinator-68ea8bb49888a616a0a62652e546f2c4fb68089e.tar.gz | |
Pass the store in to delete-outputs
| -rw-r--r-- | guix-build-coordinator/agent.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/guix-build-coordinator/agent.scm b/guix-build-coordinator/agent.scm index 7fce2db..bd81002 100644 --- a/guix-build-coordinator/agent.scm +++ b/guix-build-coordinator/agent.scm @@ -829,7 +829,7 @@ but the guix-daemon claims it's unavailable" missing-files unavailable-outputs)))))))))) - (define (delete-outputs derivation) + (define (delete-outputs store derivation) (let* ((outputs (derivation-outputs derivation)) (output-file-names (map derivation-output-path (map cdr outputs)))) @@ -845,10 +845,9 @@ but the guix-daemon claims it's unavailable" ;; There can be issues deleting links when collecting garbage ;; from multiple threads (monitor - (with-store store - ;; TODO Do something with the logged output - (parameterize ((current-build-output-port log-port)) - (delete-paths store output-file-names)))) + ;; TODO Do something with the logged output + (parameterize ((current-build-output-port log-port)) + (delete-paths store output-file-names))) #t) (lambda (key args) (display (get-output-string log-port)) @@ -892,7 +891,7 @@ but the guix-daemon claims it's unavailable" (begin (log-msg lgr 'DEBUG build-id ": derivation read from file") - (match (delete-outputs derivation) + (match (delete-outputs store derivation) (#t (let ((missing-inputs (find-missing-inputs derivation (derivation-inputs derivation)))) |