fix collate order syntax

[zpackage] / zpm-merge

diff --git a/zpm-merge b/zpm-merge
index 451aece98a79b82e5741a291aedc97607c2eafb5..87954dec2fef05abe6da0cb8bed898cb7ba24e1b 100755 (executable)
--- a/zpm-merge
+++ b/zpm-merge
@@ -19,11 +19,15 @@ mergefiles=0
 mergescripts=1
 mergeall=1
 update=0
+remove_older=0
+only_if_newer=0
 
 target=${ZPMDB:=/var/lib/zpm/local.db}
 
+# TODO option to only update if new
+# new is hash is different or build time is later
 # TODO option to merge all packages found in pkgfile
-while getopts :f:vd:FSs:au opt; do
+while getopts :f:vd:FSs:auon opt; do
        case $opt in
                f) pkgfile="$OPTARG" ;;
                v) verbose=1 ;;
@@ -33,7 +37,8 @@ while getopts :f:vd:FSs:au opt; do
                s) newstatus="$OPTARG" ;;
                a) mergeall=1 ;;
                u) update=1 ;;
-
+               o) remove_older=1 ;;
+               n) only_if_newer=1 ;;
                *) echo 'zpm-merge unknown option' $OPTARG; exit 1 ;;
        esac
 done
@@ -112,10 +117,14 @@ 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 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"
        printf "insert or rollback into scripts select * from remote.scripts P %s;\n" "$where"
@@ -152,6 +161,29 @@ if [ $update -eq 0 ]; then
        fi
 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'")
+       if [ "$newer" = '1' ] || [ -z "$newer" ]; then
+               return 0;
+       fi
+       return 1
+}
+
+mlist="$pkglist"
+if [ $only_if_newer -eq 1 ]; then
+       mlist=
+       for pkgid in $pkglist; do
+               if check_newer "$pkgid" ; then
+                       mlist="$mlist $pkgid"
+               fi
+       done
+       if [ -z "$mlist" ]; then
+               exit 0
+       fi
+fi
+
 # TODO file tags and package tags
 {
        printf ".bail on\n"