From: Nathan Wagner <nw@hydaspes.if.org>
Date: Mon, 26 Nov 2018 04:34:22 +0000 (+0000)
Subject: fixup merge bug
X-Git-Tag: v0.3.0~25
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=6fbdbc82ac30e6beea0e5a5ce0b6fd11311abe2c

fixup merge bug
---

diff --git a/zpm-merge b/zpm-merge
index f6529ce..dc6f51c 100755
--- a/zpm-merge
+++ b/zpm-merge
@@ -164,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') and 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