From 2cd74312335854621dc11ddfe55181292eb89c38 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Sat, 12 Oct 2019 16:19:43 +0000 Subject: [PATCH] add packagedeps to merge --- Makefile | 2 +- bin/zpm-merge | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e23545d..8452ed8 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,7 @@ stest: $(ZPKGBIN) 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) diff --git a/bin/zpm-merge b/bin/zpm-merge index 48d826f..5fcd257 100755 --- 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 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" -- 2.40.0