From: Nathan Wagner <nw@hydaspes.if.org>
Date: Wed, 28 Nov 2018 02:10:59 +0000 (+0000)
Subject: fix merge update syntax
X-Git-Tag: v0.3.0~12
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=f600cd71e6816c2c69deef5a805759bf3de2e616

fix merge update syntax
---

diff --git a/zpm-merge b/zpm-merge
index 87954de..250e85e 100755
--- a/zpm-merge
+++ b/zpm-merge
@@ -164,9 +164,9 @@ fi
 check_newer() {
 	pkg=$1
 	package=$(zpm parse -n "$pkg")
-	newer=$(zpm shell "$target" "select '$pkg' > (select max(pkgid collate vercmp) from packages_pkgid where package = '$package') from packages_pkgid where package = '$package'")
+	newer=$(zpm shell "$target" "select '$pkg' > (select max(pkgid collate vercmp) from packages_pkgid where package = '$package') collate vercmp")
 	if [ "$newer" = '1' ] || [ -z "$newer" ]; then
-		return 0;
+		return 0
 	fi
 	return 1
 }