X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=zpm-merge;h=f6529ceba45ca8055c0403d2700f24df888fac75;hp=5d3692623dfc762be963380f9bfed7fde94d0e41;hb=f0762b0c3b82fd7d56d5ea90554967a184ec14be;hpb=b14d452ddce90289441c07447d4d4a27821a5ce3

diff --git a/zpm-merge b/zpm-merge
index 5d36926..f6529ce 100755
--- a/zpm-merge
+++ b/zpm-merge
@@ -117,12 +117,13 @@ fi
 
 mergeone() {
 	pkgid=$1
+	package=$(zpm parse -n "$pkgid")
 	where="where printf('%s-%s-%s', P.package, P.version, P.release) = '$pkgid'"
 	if [ $update -eq 1 ]; then
 		printf "delete from packages_pkgid where pkgid = '%s';\n" "$pkgid"
 	fi
 	if [ $remove_older -eq 1 ]; then
-		printf "delete from packages_pkgid where pkgid < '%s' collate vercmp;\n" "$pkgid"
+		printf "delete from packages_pkgid where package = '$package' and pkgid < '%s' collate vercmp;\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"