From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 10 Oct 2008 22:02:15 +0000 (-0000)
Subject: only use dummy echos in do_file() when running in interactive mode
X-Git-Tag: v2.2_rc13~103
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44b31cc1d053d427591155a57bc091de907723f2;p=portage.git

only use dummy echos in do_file() when running in interactive mode

svn path=/main/trunk/; revision=11673
---

diff --git a/bin/etc-update b/bin/etc-update
index ff1378f63..cb58d13f1 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -227,7 +227,8 @@ read_int() {
 }
 
 do_file() {
-	echo
+	interactive_echo() { [ "${OVERWRITE_ALL}" != "yes" ] && [ "${DELETE_ALL}" != "yes" ] && echo; }
+	interactive_echo
 	local -i my_input
 	local -i fcount=0
 	until (( $(wc -l < ${TMP}/files/${input}) < 2 )); do
@@ -296,7 +297,7 @@ do_file() {
 			break
 		fi
 	done
-	echo
+	interactive_echo
 	rm ${TMP}/files/${input}
 	count=${count}-1
 }