let newpackage set additional fields

[zpackage] / zpm-update

diff --git a/zpm-update b/zpm-update
index 39c111a2f17f6e7274bac7f298f09834b8e427ea..5ee5008c55430d80d9cdc7c28f04b947d7f5e5ff 100755 (executable)
--- a/zpm-update
+++ b/zpm-update
@@ -109,7 +109,7 @@ uninstall=0
 
 # TODO option to attempt to resume an ongoing install
 # zpm-install [-SCn] [ -d localdb ] [ -f pkgfile ] [ -R installroot ] pkgstr ...
-while getopts f:d:R:nSCvAObBLUzp opt; do
+while getopts f:d:R:nSCvAObBLUzpl opt; do
        case $opt in
                f) pkgfile="$OPTARG" ;;
                d) localdb="$OPTARG" ;;
@@ -237,7 +237,6 @@ for mergepkg in $merge; do
                                nlist="$nlist $pkgid:$zpmfile"
                                continue
                        else
-                               echo downloading $zpmfile
                                zpm repo fetch $reponame $pkgid
                                if [ -f "$zpmfile" ]; then
                                        nlist="$nlist $pkgid:$zpmfile"
@@ -293,7 +292,7 @@ for mergepkg in $merge; do
        # TODO check for symlinks?
        if [ $pkgfile != $ZPMDB ]; then
                echo merging $pkgfile $pkgid
-               zpm merge -Fuv -f "$pkgfile" $pkgid
+               zpm merge -Fu -f "$pkgfile" $pkgid
                if [ $? -ne 0 ]; then
                        die "unable to merge $pkgfile"
                fi
@@ -342,10 +341,11 @@ fi
 
 if [ $verbose -gt 0 ]; then
        syncopts="${syncopts} -v"
-else
-       # force -v during development
-       syncopts="${syncopts} -v"
 fi
+#else
+       # force -v during development
+       #syncopts="${syncopts} -v"
+#fi
 
 if [ $dryrun -eq 0 ] && [ $backup -eq 1 ]; then
        true