add missing merge option

[zpackage] / zpm-merge

diff --git a/zpm-merge b/zpm-merge
index 67b8c7376e8419164b11250d52eabe2a62f236eb..451aece98a79b82e5741a291aedc97607c2eafb5 100755 (executable)
--- a/zpm-merge
+++ b/zpm-merge
@@ -101,7 +101,7 @@ if [ $mergeall -eq 0 ]; then
        fi
        pkglist=$pkgid
 else
-       pkglist=$(zpm list "$pkgfile")
+       pkglist=$(zpm list -f "$pkgfile")
 fi
 
 zpm test -v "$pkgfile" || exit 1
@@ -114,7 +114,7 @@ mergeone() {
        pkgid=$1
        where="where printf('%s-%s-%s', P.package, P.version, P.release) = '$pkgid'"
        if [ $update -eq 1 ]; then
-               printf "delete from packages %s;\n" "$where"
+               printf "delete from packages_pkgid where pkgid = '%s';\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"
@@ -167,3 +167,7 @@ fi
 
        printf "commit;\n"
 } | zpm shell $target
+
+if [ $verbose -ne 0 ]; then
+       printf "%s\n" $pkglist
+fi