aboutsummaryrefslogtreecommitdiff
path: root/guix-build-coordinator/datastore
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2020-12-23 20:47:28 +0000
committerChristopher Baines <mail@cbaines.net>2020-12-23 20:47:28 +0000
commitc33d3f570bd32afc2def410067db6b92ad6aff0a (patch)
treea48f84e26075e184293fcd0242a4e647a0733fc9 /guix-build-coordinator/datastore
parent3d949af3f82519f480b7cac9bafe0536fa83cf98 (diff)
downloadbuild-coordinator-c33d3f570bd32afc2def410067db6b92ad6aff0a.tar
build-coordinator-c33d3f570bd32afc2def410067db6b92ad6aff0a.tar.gz
Avoid canonicalize-path breaking on first setup
It fails if the file doesn't exist, so run it on the directory instead.
Diffstat (limited to 'guix-build-coordinator/datastore')
-rw-r--r--guix-build-coordinator/datastore/sqlite.scm11
1 files changed, 7 insertions, 4 deletions
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"