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 1Pm4UO-0007tR-SK for garchives@archives.gentoo.org; Sun, 06 Feb 2011 13:17:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04EEAE0B9A; Sun, 6 Feb 2011 13:09:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C84D2E0B95 for ; Sun, 6 Feb 2011 13:09:54 +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 5EB1A1B41C6 for ; Sun, 6 Feb 2011 13:09:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CAC9D8006E for ; Sun, 6 Feb 2011 13:09:51 +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: Subject: [gentoo-commits] proj/portage:multilib commit in: pym/_emerge/resolver/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Package.py pym/_emerge/resolver/output.py X-VCS-Directories: pym/_emerge/resolver/ pym/_emerge/ X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: ea8827f3893cc8324adbac03c6fa63398598ab01 Date: Sun, 6 Feb 2011 13:09:51 +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: e83d0a74781a6107bfc93616a17bf42f commit: ea8827f3893cc8324adbac03c6fa63398598ab01 Author: Brian Dolbec gmail com> AuthorDate: Sun Jan 30 20:42:44 2011 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Sun Jan 30 22:37:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dea8827f3 fix the problem of mixing "**" and ebuild keywords for only some archs --- pym/_emerge/Package.py | 7 ++++++- pym/_emerge/resolver/output.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index bf02192..9f21057 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -243,10 +243,15 @@ class Package(Task): missing, _keywords =3D \ self.root_config.settings._getRawMissingKeywords( self.cpv, self.metadata) + unmasks =3D self.root_config.settings._getPKeywords( + self.cpv, self.metadata) + if '**' in missing: return '**' if missing: # keywords to evaluate - for keyword in _keywords: + for keyword in _keywords + unmasks: + if keyword =3D=3D '**': + return keyword used_keyword =3D '~' + keyword if used_keyword in missing: return used_keyword diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output= .py index 51d9d3c..ffee6da 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -165,7 +165,7 @@ class Display(object): """ used_keyword =3D pkg.accepted_keyword() hardmasked =3D pkg.isHardMasked() - if used_keyword not in self.pkgsettings['ACCEPT_KEYWORDS'] or hardmask= ed: + if used_keyword not in self.pkgsettings['ACCEPT_KEYWORDS'].split() or = hardmasked: if hardmasked: self.verboseadd +=3D 'keyword=3D' + red('[%s] ' % used_keyword) else: