let newpackage set additional fields

[zpackage] / zpm-merge

diff --git a/zpm-merge b/zpm-merge
index 0af784927f8cf1533258b326d564ce3f4da46b00..840296f35883356bd9fccc8949fc5ffbafa5a866 100755 (executable)
--- 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 )) ;;
@@ -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