fixup

diff --git a/zpm-merge b/zpm-merge
index 5d3692623dfc762be963380f9bfed7fde94d0e41..f6529ceba45ca8055c0403d2700f24df888fac75 100755 (executable)
--- 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"