From 7c1eedfba9ef5ccc5651cd5e88662c158e594a2c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 14 Mar 2023 10:16:49 +0000 Subject: More fixes for the combined post publish hook --- guix-build-coordinator/hooks.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'guix-build-coordinator/hooks.scm') diff --git a/guix-build-coordinator/hooks.scm b/guix-build-coordinator/hooks.scm index ad03465..db44db6 100644 --- a/guix-build-coordinator/hooks.scm +++ b/guix-build-coordinator/hooks.scm @@ -267,7 +267,8 @@ (lambda (output) (process-output drv-name output)) (datastore-list-build-outputs datastore build-id))))) - (when combined-post-publish-hook + (when (and combined-post-publish-hook + (not (null? narinfos-and-nars))) (with-exception-handler (lambda (exn) ;; Rollback narinfo creation, to make this more @@ -275,7 +276,9 @@ (for-each (match-lambda ((narinfo-filename . _) - (delete-file narinfo-filename))) + (delete-file + (string-append + narinfo-directory "/" narinfo-filename)))) narinfos-and-nars) (raise-exception exn)) -- cgit v1.2.3