From: Nathan Wagner <nw@hydaspes.if.org>
Date: Mon, 26 Nov 2018 03:23:25 +0000 (+0000)
Subject: fix query bug in merge
X-Git-Tag: v0.3.0~32
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=2ee70d344aec86494bb08c656d3dc8c8ec89335d

fix query bug in merge
---

diff --git a/zpm-merge b/zpm-merge
index 0505af0..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