From 2dc6adbbbd6cec095d8606973c81d62d5930b87a Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 16 Sep 2020 19:39:04 +0100 Subject: Fix the sqitch --chdir argument for installations --- guix-build-coordinator/datastore/sqlite.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm index c598b43..6de0187 100644 --- a/guix-build-coordinator/datastore/sqlite.scm +++ b/guix-build-coordinator/datastore/sqlite.scm @@ -1737,7 +1737,14 @@ WHERE build_results.build_id = :build_id"))) (list (%config 'sqitch) "deploy" "--db-client" (%config 'sqitch-sqlite) - "--chdir" (dirname (dirname (%config 'sqitch-plan))) + ;; if sqitch.conf exists (which it should when developing), + ;; just use the current directory as the chdir value. Otherwise + ;; use the directory which should contain the right files after + ;; installation. + "--chdir" (if (file-exists? "sqitch.conf") + (getcwd) + (string-append (dirname (%config 'sqitch-plan)) + "/sqlite")) "--plan-file" (%config 'sqitch-plan) (string-append "db:sqlite:" database-file)))) -- cgit v1.2.3