let newpackage set additional fields

[zpackage] / zpm-merge

diff --git a/zpm-merge b/zpm-merge
index fc8a38bab11477c16d9e0479497ee3925d4cc19f..840296f35883356bd9fccc8949fc5ffbafa5a866 100755 (executable)
--- a/zpm-merge
+++ b/zpm-merge
@@ -216,10 +216,6 @@ merge_list() {
 
        printf "commit;\n"
 ) | zpm shell $target
-
-if [ $verbose -ne 0 ]; then
-       printf "%s\n" $pkglist
-fi
 }
 
 # check for already merged packages
@@ -243,8 +239,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