From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A8654198005 for ; Mon, 18 Mar 2013 21:12:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10482E058A; Mon, 18 Mar 2013 21:12:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9EBE5E058A for ; Mon, 18 Mar 2013 21:12:40 +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 7BBA133D8A3 for ; Mon, 18 Mar 2013 21:12:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0EFDEE4073 for ; Mon, 18 Mar 2013 21:12:38 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1363641146.10eaee904811c2037a9380446f92f7677ed2ada9.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: 10eaee904811c2037a9380446f92f7677ed2ada9 X-VCS-Branch: master Date: Mon, 18 Mar 2013 21:12:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 64d0316b-a14e-4ca1-995d-996b5108d12c X-Archives-Hash: 1d01232435bd8027b57465bdef78e31e commit: 10eaee904811c2037a9380446f92f7677ed2ada9 Author: Zac Medico gentoo org> AuthorDate: Mon Mar 18 21:12:26 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Mar 18 21:12:26 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=10eaee90 resolver/output: rename Display._blockers() param --- pym/_emerge/resolver/output.py | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 8072c1f..93a896d 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -69,16 +69,16 @@ class Display(object): self.blocker_style = None - def _blockers(self, pkg): - """Processes pkg for blockers and adds colorized strings to + def _blockers(self, blocker): + """Adds colorized strings to self.print_msg and self.blockers - @param pkg: _emerge.Package.Package instance + @param blocker: _emerge.Blocker.Blocker instance @rtype: bool Modifies class globals: self.blocker_style, self.resolved, self.print_msg """ - if pkg.satisfied: + if blocker.satisfied: self.blocker_style = "PKG_BLOCKER_SATISFIED" addl = "%s " % (colorize(self.blocker_style, "b"),) else: @@ -86,7 +86,7 @@ class Display(object): addl = "%s " % (colorize(self.blocker_style, "B"),) addl += self.empty_space_in_brackets() self.resolved = dep_expand( - _unicode(pkg.atom).lstrip("!"), mydb=self.vardb, + _unicode(blocker.atom).lstrip("!"), mydb=self.vardb, settings=self.pkgsettings ) if self.conf.columns and self.conf.quiet: @@ -97,17 +97,17 @@ class Display(object): addl, self.indent, colorize(self.blocker_style, _unicode(self.resolved)) ) - block_parents = self.conf.blocker_parents.parent_nodes(pkg) - block_parents = set([pnode[2] for pnode in block_parents]) + block_parents = self.conf.blocker_parents.parent_nodes(blocker) + block_parents = set(_unicode(pnode.cpv) for pnode in block_parents) block_parents = ", ".join(block_parents) - if self.resolved != pkg[2]: + if self.resolved != blocker.atom: addl += colorize(self.blocker_style, " (\"%s\" is blocking %s)") % \ - (_unicode(pkg.atom).lstrip("!"), block_parents) + (_unicode(blocker.atom).lstrip("!"), block_parents) else: addl += colorize(self.blocker_style, " (is blocking %s)") % block_parents - if isinstance(pkg, Blocker) and pkg.satisfied: + if blocker.satisfied: if not self.conf.columns: self.print_msg.append(addl) else: