fix tap diagnostic

[zpackage] / zpm-merge

diff --git a/zpm-merge b/zpm-merge
index fc8a38bab11477c16d9e0479497ee3925d4cc19f..48d826f4d2f6f7cba8ea8798194e3b1fb7305882 100755 (executable)
--- a/zpm-merge
+++ b/zpm-merge
@@ -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