diff options
| -rw-r--r-- | nar-herder/storage.scm | 6 | ||||
| -rw-r--r-- | scripts/nar-herder.in | 5 |
2 files changed, 7 insertions, 4 deletions
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)) diff --git a/scripts/nar-herder.in b/scripts/nar-herder.in index 37705bc..32a2afa 100644 --- a/scripts/nar-herder.in +++ b/scripts/nar-herder.in @@ -131,8 +131,9 @@ (lambda (opt name arg result) (alist-cons 'storage-nar-removal-criteria (match (string-split arg #\=) - ((sym rest ...) - (cons (string->symbol sym) rest))) + ((sym rest) + (list (string->symbol sym) + (call-with-input-string rest read)))) result))) (option '("ttl") #t #f |