]> pd.if.org Git - zpackage/commitdiff
fix merge update syntax
authorNathan Wagner <nw@hydaspes.if.org>
Wed, 28 Nov 2018 02:10:59 +0000 (02:10 +0000)
committerNathan Wagner <nw@hydaspes.if.org>
Wed, 28 Nov 2018 02:10:59 +0000 (02:10 +0000)
zpm-merge

index 87954dec2fef05abe6da0cb8bed898cb7ba24e1b..250e85e38df99dafeab1535b679e8185724d0ff8 100755 (executable)
--- 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
 }