From: Nathan Wagner <nw@hydaspes.if.org>
Date: Mon, 3 Dec 2018 11:43:31 +0000 (+0000)
Subject: exit update early where appropriate
X-Git-Tag: v0.3.5
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=3178018143a7ffcef6746e802f58fe1c4725c0dd

exit update early where appropriate
---

diff --git a/zpm-update b/zpm-update
index 4452978..fdfa1f6 100755
--- 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