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 1Ri8wO-0001af-Oc for garchives@archives.gentoo.org; Tue, 03 Jan 2012 18:18:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B39DAE05A5; Tue, 3 Jan 2012 18:18:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 86749E05A5 for ; Tue, 3 Jan 2012 18:18:16 +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 0F60F1B4012 for ; Tue, 3 Jan 2012 18:18:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6E22C80042 for ; Tue, 3 Jan 2012 18:18:15 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/paludispm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/paludispm/pkg.py X-VCS-Directories: gentoopm/paludispm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: bf623fe3a1dcab55c03e906b1be395d3b772a0eb Date: Tue, 3 Jan 2012 18:18:15 +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: 7ad1d087-f43f-4941-b3fa-75b7c31bae45 X-Archives-Hash: e32c14de3eec1bc9f6dffd308e5996f6 commit: bf623fe3a1dcab55c03e906b1be395d3b772a0eb Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Tue Jan 3 18:19:08 2012 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Tue Jan 3 18:19:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3Dbf623fe3 Paludis: update USEflag grepping API. --- gentoopm/paludispm/pkg.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py index ba34e5d..15b5995 100644 --- a/gentoopm/paludispm/pkg.py +++ b/gentoopm/paludispm/pkg.py @@ -59,8 +59,13 @@ class PaludisChoiceSet(SpaceSepFrozenSet): if group.raw_name =3D=3D 'build_options': # paludis specific continue for c in group: - if c.explicitly_listed: - yield PaludisChoice(c) + try: + if c.origin !=3D paludis.ChoiceOrigin.EXPLICIT: + continue + except AttributeError: + if not c.explicitly_listed: + continue + yield PaludisChoice(c) =20 self._choices =3D choices return SpaceSepFrozenSet.__new__(self, _get_iuse())