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

diff --git a/zpm-merge b/zpm-merge
index f2c26e7..dc6f51c 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"
@@ -163,8 +164,8 @@ 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')")
-	if [ "$newer" = '1' ]; then
+	newer=$(zpm shell "$target" "select '$pkg' > (select max(pkgid) collate vercmp from packages_pkgid where package = '$package') from packages_pkgid where package = '$package'")
+	if [ "$newer" = '1' ] || [ -z "$newer" ]; then
 		return 0;
 	fi
 	return 1
@@ -186,7 +187,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"