X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-merge;h=451aece98a79b82e5741a291aedc97607c2eafb5;hb=0b5d1faa3bed99cfe7bf7556304387832c0fcd0e;hp=8b481688eab94be99531d16dc7e4ecb1e7ed052d;hpb=987426b66bb6acbef1e3da4485caa027ef106bc1;p=zpackage

diff --git a/zpm-merge b/zpm-merge
index 8b48168..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 %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"
@@ -167,3 +167,7 @@ fi
 
 	printf "commit;\n"
 } | zpm shell $target
+
+if [ $verbose -ne 0 ]; then
+	printf "%s\n" $pkglist
+fi