From: Nathan Wagner <nw@hydaspes.if.org>
Date: Tue, 13 Nov 2018 21:57:58 +0000 (+0000)
Subject: add missing merge option
X-Git-Tag: v0.2.16~13
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=0b5d1faa3bed99cfe7bf7556304387832c0fcd0e

add missing merge option
---

diff --git a/zpm-merge b/zpm-merge
index 8747a6b..451aece 100755
--- a/zpm-merge
+++ b/zpm-merge
@@ -114,7 +114,7 @@ mergeone() {
 	pkgid=$1
 	where="where printf('%s-%s-%s', P.package, P.version, P.release) = '$pkgid'"
 	if [ $update -eq 1 ]; then
-		printf "delete from packages P %s;\n" "$where"
+		printf "delete from packages_pkgid where pkgid = '%s';\n" "$pkgid"
 	fi
 	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"