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 1RpNSe-00088r-Mv for garchives@archives.gentoo.org; Mon, 23 Jan 2012 17:13:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38C01E0A4A; Mon, 23 Jan 2012 17:13:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 00FECE0A4A for ; Mon, 23 Jan 2012 17:13:31 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D7361B4027 for ; Mon, 23 Jan 2012 17:13:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 856C580044 for ; Mon, 23 Jan 2012 17:13:30 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/resolver/output.py X-VCS-Directories: pym/_emerge/resolver/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: b0f0f253ac206a0ae0800777fca97375107458a9 Date: Mon, 23 Jan 2012 17:13:30 +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: 255c011c-688d-4c3e-863d-d05e11b76f54 X-Archives-Hash: 09bf985dbbf99cbae3195fc62c36b239 commit: b0f0f253ac206a0ae0800777fca97375107458a9 Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Mon Jan 23 17:07:40 2012 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gentoo org> CommitDate: Mon Jan 23 17:07:40 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db0f0f253 Fix display of installed version for packages, which have multiple slots installed. Follow-up to commit 8118be36842a2db2eb72538e21a3b343773b3365. --- pym/_emerge/resolver/output.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output= .py index b10e802..ed72b23 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -755,8 +755,9 @@ class Display(object): installed_versions =3D self.vardb.match_pkgs(pkg.cp) if self.vardb.cpv_exists(pkg.cpv): addl =3D " "+yellow("R")+pkg_info.fetch_symbol+" " - if not self.quiet_repo_display and installed_versions[0].repo !=3D pk= g.repo: - myoldbest =3D installed_versions + installed_version =3D self.vardb.match_pkgs(pkg.cpv)[0] + if not self.quiet_repo_display and installed_version.repo !=3D pkg.re= po: + myoldbest =3D [installed_version] if pkg_info.ordered: if pkg_info.merge: self.counters.reinst +=3D 1