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 1ShZEb-0004I1-Or for garchives@archives.gentoo.org; Thu, 21 Jun 2012 04:43:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0933E081E; Thu, 21 Jun 2012 04:43:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5CC57E081E for ; Thu, 21 Jun 2012 04:43:02 +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 99B991B4033 for ; Thu, 21 Jun 2012 04:43:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3F30FE5435 for ; Thu, 21 Jun 2012 04:43:00 +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: <1340253769.e232dfec84dbd2506616ffd39b3d11fa7b2f1d22.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.py X-VCS-Directories: pym/_emerge/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e232dfec84dbd2506616ffd39b3d11fa7b2f1d22 X-VCS-Branch: master Date: Thu, 21 Jun 2012 04:43:00 +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: 2f152544-68c9-4ed0-8892-dfaa2d7687a1 X-Archives-Hash: e7ad10da138725f7142099abb6a2f0fe commit: e232dfec84dbd2506616ffd39b3d11fa7b2f1d22 Author: Zac Medico gentoo org> AuthorDate: Thu Jun 21 04:42:49 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jun 21 04:42:49 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De232dfec resolver/output: cleanup counters --- pym/_emerge/resolver/output.py | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output= .py index 1208bf9..61cfe9e 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -516,8 +516,7 @@ class Display(object): =20 @return addl: formatted slot info @return myoldbest: installed version list - Modifies self.counters.downgrades, self.counters.upgrades, - self.counters.binary + Modifies self.counters.downgrades, self.counters.upgrades """ addl =3D " " + pkg_info.fetch_symbol if not cpvequal(pkg.cpv, @@ -526,15 +525,11 @@ class Display(object): addl +=3D turquoise("U")+blue("D") if pkg_info.ordered: self.counters.downgrades +=3D 1 - if pkg.type_name =3D=3D "binary": - self.counters.binary +=3D 1 else: # Update in slot addl +=3D turquoise("U") + " " if pkg_info.ordered: self.counters.upgrades +=3D 1 - if pkg.type_name =3D=3D "binary": - self.counters.binary +=3D 1 return addl =20 =20 @@ -543,13 +538,11 @@ class Display(object): =20 @return addl: formatted slot info @return myoldbest: installed version list - Modifies self.counters.newslot, self.counters.binary + Modifies self.counters.newslot """ addl =3D " " + green("NS") + pkg_info.fetch_symbol + " " if pkg_info.ordered: self.counters.newslot +=3D 1 - if pkg.type_name =3D=3D "binary": - self.counters.binary +=3D 1 return addl =20 =20 @@ -651,6 +644,12 @@ class Display(object): pkg_info.built =3D pkg.type_name !=3D "ebuild" pkg_info.ebuild_path =3D None pkg_info.repo_name =3D pkg.repo + if ordered: + if pkg_info.merge: + if pkg.type_name =3D=3D "binary": + self.counters.binary +=3D 1 + elif pkg_info.operation =3D=3D "uninstall": + self.counters.uninst +=3D 1 if pkg.type_name =3D=3D "ebuild": pkg_info.ebuild_path =3D self.portdb.findname( pkg.cpv, myrepo=3Dpkg_info.repo_name) @@ -751,7 +750,7 @@ class Display(object): @param pkg: _emerge.Package.Package instance @param pkg_info: dictionay @rtype addl, myoldbest: list, myinslotlist: list - Modifies self.counters.reinst, self.counters.binary, self.counters.new + Modifies self.counters.reinst, self.counters.new =20 """ myoldbest =3D [] @@ -765,10 +764,6 @@ class Display(object): if pkg_info.ordered: if pkg_info.merge: self.counters.reinst +=3D 1 - if pkg.type_name =3D=3D "binary": - self.counters.binary +=3D 1 - elif pkg_info.operation =3D=3D "uninstall": - self.counters.uninst +=3D 1 # filter out old-style virtual matches elif installed_versions and \ installed_versions[0].cp =3D=3D pkg.cp: @@ -790,8 +785,6 @@ class Display(object): addl =3D " " + green("N") + " " + pkg_info.fetch_symbol + " " if pkg_info.ordered: self.counters.new +=3D 1 - if pkg.type_name =3D=3D "binary": - self.counters.binary +=3D 1 return addl, myoldbest, myinslotlist =20 =20