add packagedeps to merge

diff --git a/Makefile b/Makefile
index e23545df4eeec7dab00872919f97e585df6fc266..8452ed85d61f35c6e9a5dfe693ca070571af9bdf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ stest: $(ZPKGBIN)
 t/ctap/prove: t/ctap/prove.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
 t/ctap/prove: t/ctap/prove.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 

-test: $(ZPKGBIN) t/ctap/prove
+test: $(ZPKGBIN) t/ctap/prove db.sql

        @PATH=$(curdir)/t:$(curdir)/bin:$(PATH) t/ctap/prove t/*.t
 
 programs: $(PROGRAMS)
        @PATH=$(curdir)/t:$(curdir)/bin:$(PATH) t/ctap/prove t/*.t
 
 programs: $(PROGRAMS)

diff --git a/bin/zpm-merge b/bin/zpm-merge
index 48d826f4d2f6f7cba8ea8798194e3b1fb7305882..5fcd257cd2ea8f4bbcc9758e09d772759f4e29ad 100755 (executable)
--- a/bin/zpm-merge
+++ b/bin/zpm-merge
@@ -135,6 +135,7 @@ mergeone() {
        printf "insert or rollback into packages select * from remote.packages P %s;\n" "$where"
        printf "insert or rollback into packagefiles select * from remote.packagefiles P %s;\n" "$where"
        printf "insert or rollback into scripts select * from remote.scripts P %s;\n" "$where"
        printf "insert or rollback into packages select * from remote.packages P %s;\n" "$where"
        printf "insert or rollback into packagefiles select * from remote.packagefiles P %s;\n" "$where"
        printf "insert or rollback into scripts select * from remote.scripts P %s;\n" "$where"

+       printf "insert or rollback into packagedeps select * from remote.packagedeps P %s;\n" "$where"

        if [ $mergefiles -eq 1 ]; then
                printf "insert into files select F.* from remote.files F\n"
                printf "inner join remote.packagefiles_pkgid P on P.hash = F.hash %s\n" "$where"
        if [ $mergefiles -eq 1 ]; then
                printf "insert into files select F.* from remote.files F\n"
                printf "inner join remote.packagefiles_pkgid P on P.hash = F.hash %s\n" "$where"