From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 15 Oct 2007 18:58:49 +0000 (-0000)
Subject: Bug #195949 - Add one more using_editor conditional for
X-Git-Tag: v2.1.3.16~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=589c712fa3ec9dff5d63d93b5ad430dfe6a019d8;p=portage.git

Bug #195949 - Add one more using_editor conditional for
diff_command. (trunk r8130)

svn path=/main/branches/2.1.2/; revision=8135
---

diff --git a/bin/etc-update b/bin/etc-update
index 60a55e3b0..7239ed07b 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -412,8 +412,16 @@ Please select from the menu above (-1 to exit, losing this merge): "
 				   rm ${rm_opts} "${file}"
 				   return 255
 				   ;;
-				2) ( echo "Showing differences between ${ofile} and ${mfile}"
-					 diff_command "${ofile}" "${mfile}" ) | ${pager}
+				2)	if [ "${using_editor}" == 0 ]; then
+						(
+							echo "Showing differences between ${ofile} and ${mfile}"
+							diff_command "${ofile}" "${mfile}"
+						) | ${pager}
+					else
+						echo "Beginning of differences between ${ofile} and ${mfile}"
+						diff_command "${ofile}" "${mfile}"
+						echo "End of differences between ${ofile} and ${mfile}"
+					fi
 				   continue
 				   ;;
 				3) break