guix
/
data-service
mirror of git://git.savannah.gnu.org/guix/data-service.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Fix a regression with running sqitch 

Introduced in 0dc05982cd.
This commit is contained in:
Christopher Baines 2021-07-11 12:40:48 +01:00
parent af209170f7
commit d1a2a7125c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix-data-service/config.scm.in
View File

@ -57,7 +57,7 @@
(sqitch-plan . ,(let ((installed-plan
"@prefix@/share/guix-data-service/sqitch/sqitch.plan")
(dev-plan
(string-append (getcwd) "/sqitch/sqitch.plan")))
"@abs_top_builddir@/sqitch/sqitch.plan"))
(if (file-exists? installed-plan)
installed-plan
dev-plan)))

8
scripts/guix-data-service.in
View File

@ -141,7 +141,13 @@
(list (%config 'sqitch)
"deploy"
"--db-client" (%config 'sqitch-psql)
"--chdir" (dirname (dirname (%config 'sqitch-plan)))
;; For some reason, sqitch behaves differently when the
;; guix-data-service is packaged, and when it's not, so try
;; and hack around this here.
"--chdir" (let ((base (dirname (%config 'sqitch-plan))))
(if (string-prefix? "/gnu" (%config 'sqitch-plan))
base
(dirname base)))
"--plan-file" (%config 'sqitch-plan)
"--mode" "change" ; this helps when migrations don't
; have the revert bit implemented