summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-10-15 18:05:13 +0000
committerZac Medico <zmedico@gentoo.org>2007-10-15 18:05:13 +0000
commit35771a0cb57807a9b51282b34ef336c57f191238 (patch)
tree53dd3c5e6ec29796ef93db8961481378a7122609
parent62c9f66e22ee9277718e3c4065f253ee691f2391 (diff)
downloadportage-35771a0cb57807a9b51282b34ef336c57f191238.tar.gz
portage-35771a0cb57807a9b51282b34ef336c57f191238.tar.bz2
portage-35771a0cb57807a9b51282b34ef336c57f191238.zip
Bug #195949 - Add one more using_editor conditional for
diff_command. svn path=/main/trunk/; revision=8130
-rwxr-xr-xbin/etc-update12
1 files changed, 10 insertions, 2 deletions
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