parent
af209170f7
commit
d1a2a7125c
|
@ -57,7 +57,7 @@
|
||||||
(sqitch-plan . ,(let ((installed-plan
|
(sqitch-plan . ,(let ((installed-plan
|
||||||
"@prefix@/share/guix-data-service/sqitch/sqitch.plan")
|
"@prefix@/share/guix-data-service/sqitch/sqitch.plan")
|
||||||
(dev-plan
|
(dev-plan
|
||||||
(string-append (getcwd) "/sqitch/sqitch.plan")))
|
"@abs_top_builddir@/sqitch/sqitch.plan"))
|
||||||
(if (file-exists? installed-plan)
|
(if (file-exists? installed-plan)
|
||||||
installed-plan
|
installed-plan
|
||||||
dev-plan)))
|
dev-plan)))
|
||||||
|
|
|
@ -141,7 +141,13 @@
|
||||||
(list (%config 'sqitch)
|
(list (%config 'sqitch)
|
||||||
"deploy"
|
"deploy"
|
||||||
"--db-client" (%config 'sqitch-psql)
|
"--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)
|
"--plan-file" (%config 'sqitch-plan)
|
||||||
"--mode" "change" ; this helps when migrations don't
|
"--mode" "change" ; this helps when migrations don't
|
||||||
; have the revert bit implemented
|
; have the revert bit implemented
|
||||||
|
|
Loading…
Reference in New Issue