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 1Pm4UK-0007sf-0u for garchives@archives.gentoo.org; Sun, 06 Feb 2011 13:17:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F05BE0BB4; Sun, 6 Feb 2011 13:10:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5D13EE0BA6 for ; Sun, 6 Feb 2011 13:10:04 +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 D4DA41B42E2 for ; Sun, 6 Feb 2011 13:10:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 53E4F80073 for ; Sun, 6 Feb 2011 13:10:02 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <30e1ece51561f2012d389350ffd8164f90ad636c.tommy@gentoo> Subject: [gentoo-commits] proj/portage:multilib 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: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: 30e1ece51561f2012d389350ffd8164f90ad636c Date: Sun, 6 Feb 2011 13:10:02 +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: 14f932706c3b5283b8b54c548afffc6e commit: 30e1ece51561f2012d389350ffd8164f90ad636c Author: Zac Medico gentoo org> AuthorDate: Wed Feb 2 21:56:30 2011 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Wed Feb 2 21:56:30 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D30e1ece5 Display: simplify alignment for mask status --- pym/_emerge/resolver/output.py | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output= .py index 46e2280..93a2b5d 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -85,9 +85,7 @@ class Display(object): self.blocker_style =3D "PKG_BLOCKER" addl =3D "%s %s " % (colorize(self.blocker_style, "B"), fetch_symbol) - if self.conf.verbosity =3D=3D 3: - # add column for mask status - addl +=3D " " + addl +=3D self.empty_space_in_brackets() self.resolved =3D dep_expand( str(pkg.atom).lstrip("!"), mydb=3Dself.vardb, settings=3Dself.pkgsettings @@ -181,6 +179,13 @@ class Display(object): =20 return mask_str =20 + def empty_space_in_brackets(self): + space =3D "" + if self.conf.verbosity =3D=3D 3: + # add column for mask status + space +=3D " " + return space + def map_to_use_expand(self, myvals, forced_flags=3DFalse, remove_hidden=3DTrue): """Map use expand variables @@ -437,10 +442,7 @@ class Display(object): self.verboseadd =3D None else: if not pkg_info.merge: - addl =3D "" - if self.conf.verbosity =3D=3D 3: - # add column for mask status - addl +=3D " " + addl =3D self.empty_space_in_brackets() myprint =3D "[%s%s] %s%s" % \ (self.pkgprint(pkg_info.operation.ljust(13), pkg_info), addl, self.indent, self.pkgprint(pkg.cp, pkg_info)) @@ -466,10 +468,7 @@ class Display(object): @rtype the updated addl """ if not pkg_info.merge: - addl =3D "" - if self.conf.verbosity =3D=3D 3: - # add column for mask status - addl +=3D " " + addl =3D self.empty_space_in_brackets() myprint =3D "[%s%s] %s%s %s" % \ (self.pkgprint(pkg_info.operation.ljust(13), pkg_info), addl, @@ -827,10 +826,7 @@ class Display(object): addl, pkg_info, pkg) else: if not pkg_info.merge: - addl =3D "" - if self.conf.verbosity =3D=3D 3: - # add column for mask status - addl +=3D " " + addl =3D self.empty_space_in_brackets() myprint =3D "[%s%s] " % ( self.pkgprint(pkg_info.operation.ljust(13), pkg_info), addl,