X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-merge;h=263ac4077d8556bebf7794b698f699617d05172b;hb=0b52926059ddded0d3eeb4c8598b097f7123d7f3;hp=8747a6bd4dc6b6175b15049a7775edb8b97291f0;hpb=9837530d635f890b5e15c0cb7653aadaf587dc5c;p=zpackage

diff --git a/zpm-merge b/zpm-merge
index 8747a6b..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
@@ -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 P %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"