From 285437697d524f4205a7f1c25a23d9ef771412f2 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 19 May 2022 08:59:58 +0100 Subject: Fiddle more with the nar removal criteria This should make the singular stored-on and and'ed stored-on work properly. --- nar-herder/storage.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'nar-herder/storage.scm') diff --git a/nar-herder/storage.scm b/nar-herder/storage.scm index 7e72910..c017685 100644 --- a/nar-herder/storage.scm +++ b/nar-herder/storage.scm @@ -209,13 +209,15 @@ (database-select-narinfo-for-file database (assq-ref nar 'url))) (match criteria - (('and and-criteria ...) + (('and and-criteria) (every (lambda (c) (check-removal-criteria nar c)) and-criteria)) (('stored-on url) (let ((uri (string->uri - (string-append url + (string-append (if (symbol? url) + (symbol->string url) + url) "/" (store-path-hash-part (assq-ref narinfo 'store-path)) -- cgit v1.2.3