exit update early where appropriate

diff --git a/zpm-update b/zpm-update
index 44529783408c1c195c4524ae071d53e574c3622a..fdfa1f6e3987cb4fa62c15a65da8f6736c753fe0 100755 (executable)
--- a/zpm-update
+++ b/zpm-update
@@ -246,6 +246,7 @@ if [ $justlist -eq 1 ]; then
        for pkgid in $to_remove; do
                printf 'remove %s\n' $pkgid
        done
+       exit 0
 fi
 
 if [ -z "$merge" ] && [ -z "$to_remove" ]; then
@@ -253,7 +254,8 @@ if [ -z "$merge" ] && [ -z "$to_remove" ]; then
        exit 0
 fi
 
-echo "merge: $merge"
+test -n "$merge" && echo "install: $merge"
+test -n "$to_remove" && echo "remove: $to_remove"
 
 # finally, merge everything
 for mergepkg in $merge; do
@@ -266,6 +268,9 @@ for mergepkg in $merge; do
        if [ $pkgfile != $ZPMDB ]; then
                echo merging $pkgfile $pkgid
                zpm merge -Fuv -f "$pkgfile" $pkgid
+               if [ $? -ne 0 ]; then
+                       die "unable to merge $pkgfile"
+               fi
        fi
        to_install="$to_install $pkgid"
 done