From 9032079bdad7300cde5d3ee8daeb88ee381a1d6b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 7 Jul 2024 11:48:17 +0200 Subject: [PATCH] Fix delete-revisions-from-branch --- guix-data-service/data-deletion.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/guix-data-service/data-deletion.scm b/guix-data-service/data-deletion.scm index 39cd9a3..13b3246 100644 --- a/guix-data-service/data-deletion.scm +++ b/guix-data-service/data-deletion.scm @@ -234,21 +234,24 @@ DROP TABLE IF EXISTS package_derivations_by_guix_revision_range_git_branch_" (filter (lambda (commit) (let ((result - (null? - (exec-query - conn - "SELECT 1 FROM git_commits WHERE commit = $1" - commit)))) + (or + (string-null? commit) + (null? + (exec-query + conn + "SELECT 1 FROM git_commits WHERE commit = $1" + (list commit)))))) (unless result (simple-format (current-error-port) "skipping ~A because it's still referenced\n" commit)) result)) commits))) - (delete-jobs conn now-unreferenced-commits) - (delete-guix-revisions conn - git-repository-id - now-unreferenced-commits))))) + (unless (null? now-unreferenced-commits) + (delete-jobs conn now-unreferenced-commits) + (delete-guix-revisions conn + git-repository-id + now-unreferenced-commits)))))) (lambda (key . args) (simple-format (current-error-port)