X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=zpm-update;h=5ee5008c55430d80d9cdc7c28f04b947d7f5e5ff;hp=0bac954fe6b84dad3cf8530edd88de02b9231de3;hb=09c80a1f8918d888063f4d1a75921a99fe5f0b5c;hpb=b9eb4486d50a2af606c6b776fcb5dfe065ccee9e

diff --git a/zpm-update b/zpm-update
index 0bac954..5ee5008 100755
--- a/zpm-update
+++ b/zpm-update
@@ -292,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
@@ -341,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