From c33d3f570bd32afc2def410067db6b92ad6aff0a Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 23 Dec 2020 20:47:28 +0000 Subject: Avoid canonicalize-path breaking on first setup It fails if the file doesn't exist, so run it on the directory instead. --- guix-build-coordinator/datastore/sqlite.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'guix-build-coordinator') diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm index 23f7e19..2ce039c 100644 --- a/guix-build-coordinator/datastore/sqlite.scm +++ b/guix-build-coordinator/datastore/sqlite.scm @@ -2410,12 +2410,15 @@ WHERE build_results.build_id = :build_id" (string-append (dirname (%config 'sqitch-plan)) "/sqlite")) "--plan-file" (%config 'sqitch-plan) - "--registry" (canonicalize-path - (string-append + "--registry" (string-append + (canonicalize-path + (dirname database-file)) + "/" + (basename (if (string-suffix? ".db" database-file) (string-drop-right database-file 3) - database-file) - "_sqitch_registry.db")) + database-file)) + "_sqitch_registry.db") (string-append "db:sqlite:" database-file)))) (simple-format #t "running command: ~A\n" -- cgit v1.2.3