X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-merge;h=48d826f4d2f6f7cba8ea8798194e3b1fb7305882;hb=62ebf390fa9ec8f7de054648e978919386fddf2f;hp=0af784927f8cf1533258b326d564ce3f4da46b00;hpb=40b7ccdf7347ae34cbaa52faadaa95ac6fe11457;p=zpackage

diff --git a/zpm-merge b/zpm-merge
index 0af7849..48d826f 100755
--- a/zpm-merge
+++ b/zpm-merge
@@ -33,7 +33,7 @@ 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:auon opt; do
+while getopts :f:vd:FSs:auonO opt; do
 	case $opt in
 		f) pkgfile="$OPTARG" ;;
 		v) verbose=$(( verbose + 1 )) ;;
@@ -213,13 +213,10 @@ merge_list() {
 
 	printf "insert or ignore into elfneeded select * from remote.elfneeded;\n"
 	printf "insert or ignore into elflibraries select * from remote.elflibraries;\n"
+	printf "insert or ignore into package_signatures select * from remote.package_signatures PS where PS.packagehash in (select hash from remote.packages);\n"
 
 	printf "commit;\n"
 ) | zpm shell $target
-
-if [ $verbose -ne 0 ]; then
-	printf "%s\n" $pkglist
-fi
 }
 
 # check for already merged packages
@@ -243,8 +240,14 @@ fi
 
 if [ $one_at_a_time -eq 1 ]; then
 	for pkgid in $pkglist; do
+		if [ $verbose -ne 0 ]; then
+			printf '%s\n' $pkgid
+		fi
 		merge_list $pkgid
 	done
 else
+	if [ $verbose -ne 0 ]; then
+		printf "%s\n" $pkglist
+	fi
 	merge_list $pkglist
 fi