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 1SAnGR-0004oG-EX for garchives@archives.gentoo.org; Thu, 22 Mar 2012 19:01:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2012E090E; Thu, 22 Mar 2012 19:00:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C78DDE090E for ; Thu, 22 Mar 2012 19:00:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E4FB1B4012 for ; Thu, 22 Mar 2012 19:00:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 08673E5403 for ; Thu, 22 Mar 2012 19:00:56 +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: <1332442839.fffa9fcef6b65f4c299f393d49396e275d78245b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/resolver/output_helpers.py X-VCS-Directories: pym/_emerge/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: fffa9fcef6b65f4c299f393d49396e275d78245b X-VCS-Branch: master Date: Thu, 22 Mar 2012 19:00:56 +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: a355e4b3-c87e-4736-9ec3-c3c3b047d771 X-Archives-Hash: 25e01a5c6dec79250ab7b037598f8298 commit: fffa9fcef6b65f4c299f393d49396e275d78245b Author: Zac Medico gentoo org> AuthorDate: Thu Mar 22 19:00:39 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Mar 22 19:00:39 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dfffa9fce emerge --changelog: show some log entries above This will fix bug #373009. --- pym/_emerge/resolver/output_helpers.py | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/resolver/output_helpers.py b/pym/_emerge/resolve= r/output_helpers.py index ae84158..e751dd8 100644 --- a/pym/_emerge/resolver/output_helpers.py +++ b/pym/_emerge/resolver/output_helpers.py @@ -534,10 +534,25 @@ def _calc_changelog(ebuildpath,current,next): #print 'XX from',current,'to',next #for div,text in divisions: print 'XX',div # skip entries for all revisions above the one we are about to emerge - for i in range(len(divisions)): - if divisions[i][0]=3D=3Dnext: - divisions =3D divisions[i:] + later_rev_index =3D None + for i, node in enumerate(divisions): + if node[0] =3D=3D next: + if later_rev_index is not None: + first_node =3D divisions[later_rev_index] + # Discard the later revision and the first ChangeLog entry + # that follows it. We want to display all the entries after + # that first entry, as discussed in bug #373009. + trimmed_lines =3D [] + iterator =3D iter(first_node[1]) + for l in iterator: + if not l: + # end of the first entry that's discarded + break + first_node =3D (None, list(iterator)) + divisions =3D [first_node] + divisions[later_rev_index+1:] break + if node[0] is not None: + later_rev_index =3D i =20 output =3D [] prev_blank =3D False