X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-merge;h=263ac4077d8556bebf7794b698f699617d05172b;hb=f85b2f817faa5e86169b4cd80539da4b7f603066;hp=67b8c7376e8419164b11250d52eabe2a62f236eb;hpb=9e4e730ecc2b7d5b99bd057f3a7efaff7e4b37d0;p=zpackage

diff --git a/zpm-merge b/zpm-merge
index 67b8c73..263ac40 100755
--- 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
@@ -101,7 +103,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 +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