From 6fbdbc82ac30e6beea0e5a5ce0b6fd11311abe2c Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Mon, 26 Nov 2018 04:34:22 +0000 Subject: [PATCH] fixup merge bug --- zpm-merge | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.40.0