From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QMXiv-0005XE-T3 for garchives@archives.gentoo.org; Wed, 18 May 2011 03:47:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C05911C1B5; Wed, 18 May 2011 03:46:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8E0B31C1B5 for ; Wed, 18 May 2011 03:46:54 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0DE031B4033 for ; Wed, 18 May 2011 03:46:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7DD0580506 for ; Wed, 18 May 2011 03:46:53 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <5cfba96ca932266c7b50c9e432f13dd858e031db.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/etc-update X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5cfba96ca932266c7b50c9e432f13dd858e031db Date: Wed, 18 May 2011 03:46:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 710a33e0be98df58a2af84db3f575e2a commit: 5cfba96ca932266c7b50c9e432f13dd858e031db Author: Zac Medico gentoo org> AuthorDate: Wed May 18 03:46:36 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed May 18 03:46:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5cfba96c etc-update: clear term when appropriate This solves an issue like bug #142508, but involving etc-update instead of dispatch-conf. This is also relevant to bug #70668, which is the same issue, though the reporter suggested to use colors to delimit the output instead of using clear. --- bin/etc-update | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/bin/etc-update b/bin/etc-update index 03e9dc9..73a1f5d 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -149,6 +149,7 @@ sel_file() { elif [ "${DELETE_ALL}" =3D=3D "yes" ]; then input=3D0 else + clear if [[ ${mode} =3D=3D 0 ]] ; then echo "The following is the list of files which need updating, each configuration file is followed by a list of possible replacement files." @@ -316,6 +317,7 @@ do_cfg() { elif [[ "${DELETE_ALL}" =3D=3D "yes" ]] && ! user_special "${ofile}"; = then my_input=3D2 else + clear if [ "${using_editor}" =3D=3D 0 ]; then ( echo "Showing differences between ${ofile} and ${file}" @@ -418,7 +420,9 @@ Please select from the menu above (-1 to exit, losing= this merge): " rm ${rm_opts} "${file}" return 255 ;; - 2) if [ "${using_editor}" =3D=3D 0 ]; then + 2) + clear + if [ "${using_editor}" =3D=3D 0 ]; then ( echo "Showing differences between ${ofile} and ${mfile}" diff_command "${ofile}" "${mfile}"