update for repository installing support

[zpackage] / zpm-merge

diff --git a/zpm-merge b/zpm-merge
index 8b481688eab94be99531d16dc7e4ecb1e7ed052d..263ac4077d8556bebf7794b698f699617d05172b 100755 (executable)
--- a/zpm-merge
+++ b/zpm-merge
@@ -22,6 +22,8 @@ update=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
        case $opt in
@@ -114,7 +116,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 +169,7 @@ fi
 
        printf "commit;\n"
 } | zpm shell $target
+
+if [ $verbose -ne 0 ]; then
+       printf "%s\n" $pkglist
+fi