From: Nathan Wagner <nw@hydaspes.if.org>
Date: Wed, 28 Nov 2018 01:48:13 +0000 (+0000)
Subject: fix collate order syntax
X-Git-Tag: v0.3.0~13
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=1972c1f6ac1502e3b06b77d7c04454c5d0a9dc9f

fix collate order syntax
---

diff --git a/zpm-merge b/zpm-merge
index dc6f51c..87954de 100755
--- a/zpm-merge
+++ b/zpm-merge
@@ -164,7 +164,7 @@ 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') from packages_pkgid where package = '$package'")
 	if [ "$newer" = '1' ] || [ -z "$newer" ]; then
 		return 0;
 	fi