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 E734A1381FA for ; Sun, 30 Dec 2012 20:25:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAE40E0684; Sun, 30 Dec 2012 20:25:16 +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 3770EE0684 for ; Sun, 30 Dec 2012 20:25:16 +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 0BC5233D73B for ; Sun, 30 Dec 2012 20:25:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A2F4CE543D for ; Sun, 30 Dec 2012 20:25:13 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1356899059.9dc72ec11c464f1fad4ddca0608a0593be23b9b5.dol-sen@gentoo> Subject: [gentoo-commits] proj/gentoolkit:gentoolkit commit in: pym/gentoolkit/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: pym/gentoolkit/flag.py X-VCS-Directories: pym/gentoolkit/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 9dc72ec11c464f1fad4ddca0608a0593be23b9b5 X-VCS-Branch: gentoolkit Date: Sun, 30 Dec 2012 20:25:13 +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: 67b1ae83-5ee1-4729-bbbb-17bcb898ced1 X-Archives-Hash: 38f06155d27a52d25ff2adcebe2faa06 commit: 9dc72ec11c464f1fad4ddca0608a0593be23b9b5 Author: Brian Dolbec gentoo org> AuthorDate: Sun Dec 30 20:24:19 2012 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Dec 30 20:24:19 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=9dc72ec1 fix bug 449300, duped use flags due to non defaulted use flags added from eclasses not matching against IUSE defaults during set() duplicate elimination. --- pym/gentoolkit/flag.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/gentoolkit/flag.py b/pym/gentoolkit/flag.py index 9983ba7..d92d904 100644 --- a/pym/gentoolkit/flag.py +++ b/pym/gentoolkit/flag.py @@ -36,7 +36,10 @@ def get_iuse(cpv): """ try: # aux_get might return dupes, so run them through set() to remove them - return list(set(portage.db[portage.root]["porttree"].dbapi.aux_get(cpv, ["IUSE"])[0].split())) + iuse = set(portage.db[portage.root]["porttree"].dbapi.aux_get(cpv, ["IUSE"])[0].split()) + # there could still be dupes due to IUSE defaults + iuse = [x for x in iuse if '+'+x not in iuse and '-'+x not in iuse] + return list(iuse) except: return [] @@ -173,7 +176,6 @@ def get_flags(cpv, final_setting=False): """ final_use, use_expand_hidden, usemasked, useforced = get_all_cpv_use(cpv) iuse_flags = filter_flags(get_iuse(cpv), use_expand_hidden, usemasked, useforced) - #flags = filter_flags(use_flags, use_expand_hidden, usemasked, useforced) if final_setting: final_flags = filter_flags(final_use, use_expand_hidden, usemasked, useforced) return iuse_flags, final_flags