add missing warn function

[zpackage] / zpm-merge

diff --git a/zpm-merge b/zpm-merge
index f2c26e7f4b6406e14f1e4455b0b0db6078a631e0..57a5359da73769da913f35af64359c02d99926ae 100755 (executable)
--- a/zpm-merge
+++ b/zpm-merge
@@ -7,13 +7,18 @@
 # -F include file content
 # -S don't include script content
 
-die() {
+warn() {
        printf 'zpm-merge:' 1>&2
        printf ' %s' "$@" 1>&2
        printf '\n' 1>&2
        exit 1
 }
 
+die() {
+       warn "$@"
+       exit 1
+}
+
 verbose=0
 mergefiles=0
 mergescripts=1
@@ -30,7 +35,7 @@ target=${ZPMDB:=/var/lib/zpm/local.db}
 while getopts :f:vd:FSs:auon opt; do
        case $opt in
                f) pkgfile="$OPTARG" ;;
-               v) verbose=1 ;;
+               v) verbose=$(( verbose + 1 )) ;;
                d) target="$OPTARG" ;;
                F) mergefiles=1 ;;
                S) mergescripts=0 ;;
@@ -101,7 +106,7 @@ if [ $mergeall -eq 0 ]; then
                pkgfile="$pkgid.zpm"
        fi
 
-       if [ $verbose -gt 0 ]; then
+       if [ $verbose -gt 1 ]; then
                echo merging $pkgfile $pkgid into $target
        fi
        pkglist=$pkgid
@@ -117,12 +122,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 +169,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
 }
@@ -186,7 +192,6 @@ fi
 # TODO file tags and package tags
 {
        printf ".bail on\n"
-       printf ".echo on\n"
        printf "attach '%s' as remote;\n" "$pkgfile"
        printf "begin;\n"