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 1RF98n-0006qm-63 for garchives@archives.gentoo.org; Sat, 15 Oct 2011 18:39:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5166021C27D; Sat, 15 Oct 2011 18:38:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2135621C27D for ; Sat, 15 Oct 2011 18:38:48 +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 98EA61B4014 for ; Sat, 15 Oct 2011 18:38:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BF8F780042 for ; Sat, 15 Oct 2011 18:38:46 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/, bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f4807e05962845c17d689b8bb80a1f55b85834c9 Date: Sat, 15 Oct 2011 18:38:46 +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: 84f47d5926a1b0b06b2f99d1761e27b7 commit: f4807e05962845c17d689b8bb80a1f55b85834c9 Author: Zac Medico gentoo org> AuthorDate: Sat Oct 15 18:38:35 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Oct 15 18:38:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df4807e05 frozenset categories optimize pordbapi.cp_list() --- bin/repoman | 6 +++--- pym/portage/package/ebuild/config.py | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/repoman b/bin/repoman index 2a6d782..b80b783 100755 --- a/bin/repoman +++ b/bin/repoman @@ -680,9 +680,9 @@ categories =3D [] for path in set([portdir, repodir]): categories.extend(portage.util.grabfile( os.path.join(path, 'profiles', 'categories'))) -repoman_settings.categories =3D tuple(sorted( - portage.util.stack_lists([categories], incremental=3D1))) -categories =3D frozenset(repoman_settings.categories) +repoman_settings.categories =3D frozenset( + portage.util.stack_lists([categories], incremental=3D1)) +categories =3D repoman_settings.categories =20 portdb.settings =3D repoman_settings root_config =3D RootConfig(repoman_settings, trees[root], None) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/e= build/config.py index 37dcbb4..a80c82d 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -606,9 +606,11 @@ class config(object): self.categories =3D [grabfile(os.path.join(x, "categories")) \ for x in locations_manager.profile_and_user_locations] category_re =3D dbapi._category_re - self.categories =3D tuple(sorted( + # categories used to be a tuple, but now we use a frozenset + # for hashed category validation in pordbapi.cp_list() + self.categories =3D frozenset( x for x in stack_lists(self.categories, incremental=3D1) - if category_re.match(x) is not None)) + if category_re.match(x) is not None) =20 archlist =3D [grabfile(os.path.join(x, "arch.list")) \ for x in locations_manager.profile_and_user_locations]