diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-15 18:58:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-15 18:58:49 +0000 |
| commit | 589c712fa3ec9dff5d63d93b5ad430dfe6a019d8 (patch) | |
| tree | b4f23446a3a07e29732188993e515f24ea9067e2 /bin/etc-update | |
| parent | 4332653b636fcd65c50c3b34e9fbbc574250dda9 (diff) | |
| download | portage-589c712fa3ec9dff5d63d93b5ad430dfe6a019d8.tar.gz portage-589c712fa3ec9dff5d63d93b5ad430dfe6a019d8.tar.bz2 portage-589c712fa3ec9dff5d63d93b5ad430dfe6a019d8.zip | |
Bug #195949 - Add one more using_editor conditional for
diff_command. (trunk r8130)
svn path=/main/branches/2.1.2/; revision=8135
Diffstat (limited to 'bin/etc-update')
| -rwxr-xr-x | bin/etc-update | 12 |
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 |