fix merge update syntax

[zpackage] / zpm-merge

diff --git a/zpm-merge b/zpm-merge
index 0505af02163cc502f59a44407ebf6a8eea7cc0fc..250e85e38df99dafeab1535b679e8185724d0ff8 100755 (executable)
--- a/zpm-merge
+++ b/zpm-merge
@@ -117,12 +117,13 @@ fi
 
 mergeone() {
        pkgid=$1
+       package=$(zpm parse -n "$pkgid")
        where="where printf('%s-%s-%s', P.package, P.version, P.release) = '$pkgid'"
        if [ $update -eq 1 ]; then
                printf "delete from packages_pkgid where pkgid = '%s';\n" "$pkgid"
        fi
        if [ $remove_older -eq 1 ]; then
-               printf "delete from packages_pkgid where pkgid < '%s' collate vercmp;\n" "$pkgid"
+               printf "delete from packages_pkgid where package = '$package' and pkgid < '%s' collate vercmp;\n" "$pkgid"
        fi
        printf "insert or rollback into packages select * from remote.packages P %s;\n" "$where"
        printf "insert or rollback into packagefiles select * from remote.packagefiles P %s;\n" "$where"
@@ -163,9 +164,9 @@ 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')")
-       if [ "$newer" = '1' ]; then
-               return 0;
+       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
        fi
        return 1
 }