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 1RooYb-00079z-Q1 for garchives@archives.gentoo.org; Sun, 22 Jan 2012 03:57:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9943BE0853; Sun, 22 Jan 2012 03:57:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5507AE0853 for ; Sun, 22 Jan 2012 03:57:21 +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 A2FA01B400C for ; Sun, 22 Jan 2012 03:57:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 103A980044 for ; Sun, 22 Jan 2012 03:57:20 +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: <47f16923b2f90ed589f21f44cf04abf5663b76f6.arfrever@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: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 47f16923b2f90ed589f21f44cf04abf5663b76f6 Date: Sun, 22 Jan 2012 03:57:20 +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: c50e1627-4b72-49e4-a0cb-8a905b9f475a X-Archives-Hash: 140b910ee30b37877b7bafec731dce3b commit: 47f16923b2f90ed589f21f44cf04abf5663b76f6 Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Sun Jan 22 03:53:59 2012 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gentoo org> CommitDate: Sun Jan 22 03:53:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D47f16923 Make the second part of_emerge.resolver.output.Display.verbose_size() conditional on self.quiet_repo_display instead of earlier returning if self.quiet_repo_display is False. No functional changes. --- pym/_emerge/resolver/output.py | 50 +++++++++++++++++++---------------= ----- 1 files changed, 24 insertions(+), 26 deletions(-) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output= .py index c912443..b10e802 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -339,36 +339,34 @@ class Display(object): self.counters.totalsize +=3D mysize self.verboseadd +=3D _format_size(mysize) =20 - if not self.quiet_repo_display: - return - - # overlay verbose - # assign index for a previous version in the same slot - slot_matches =3D self.vardb.match(pkg.slot_atom) - if slot_matches: - repo_name_prev =3D self.vardb.aux_get(slot_matches[0], - ["repository"])[0] - else: - repo_name_prev =3D None + if self.quiet_repo_display: + # overlay verbose + # assign index for a previous version in the same slot + slot_matches =3D self.vardb.match(pkg.slot_atom) + if slot_matches: + repo_name_prev =3D self.vardb.aux_get(slot_matches[0], + ["repository"])[0] + else: + repo_name_prev =3D None =20 - # now use the data to generate output - if pkg.installed or not slot_matches: - self.repoadd =3D self.conf.repo_display.repoStr( - pkg_info.repo_path_real) - else: - repo_path_prev =3D None - if repo_name_prev: - repo_path_prev =3D self.portdb.getRepositoryPath( - repo_name_prev) - if repo_path_prev =3D=3D pkg_info.repo_path_real: + # now use the data to generate output + if pkg.installed or not slot_matches: self.repoadd =3D self.conf.repo_display.repoStr( pkg_info.repo_path_real) else: - self.repoadd =3D "%s=3D>%s" % ( - self.conf.repo_display.repoStr(repo_path_prev), - self.conf.repo_display.repoStr(pkg_info.repo_path_real)) - if self.repoadd: - repoadd_set.add(self.repoadd) + repo_path_prev =3D None + if repo_name_prev: + repo_path_prev =3D self.portdb.getRepositoryPath( + repo_name_prev) + if repo_path_prev =3D=3D pkg_info.repo_path_real: + self.repoadd =3D self.conf.repo_display.repoStr( + pkg_info.repo_path_real) + else: + self.repoadd =3D "%s=3D>%s" % ( + self.conf.repo_display.repoStr(repo_path_prev), + self.conf.repo_display.repoStr(pkg_info.repo_path_real)) + if self.repoadd: + repoadd_set.add(self.repoadd) =20 =20 def convert_myoldbest(self, myoldbest):