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

diff --git a/zpm-merge b/zpm-merge
index f2c26e7..5d36926 100755
--- a/zpm-merge
+++ b/zpm-merge
@@ -163,7 +163,7 @@ fi
 check_newer() {
 	pkg=$1
 	package=$(zpm parse -n "$pkg")
-	newer=$(zpm shell "$target" "select 1 from packages_pkgid where '$pkg' > (select max(pkgid) collate vercmp from packages_pkgid where package = '$package')")
+	newer=$(zpm shell "$target" "select 1 from packages_pkgid where '$pkg' > (select max(pkgid) collate vercmp from packages_pkgid where package = '$package') and package = '$package'")
 	if [ "$newer" = '1' ]; then
 		return 0;
 	fi
@@ -186,7 +186,6 @@ fi
 # TODO file tags and package tags
 {
 	printf ".bail on\n"
-	printf ".echo on\n"
 	printf "attach '%s' as remote;\n" "$pkgfile"
 	printf "begin;\n"