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 <gentoo-commits+bounces-392536-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RF9Rj-0002Do-1e
for garchives@archives.gentoo.org; Sat, 15 Oct 2011 18:58:59 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0909121C230;
Sat, 15 Oct 2011 18:58:46 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id CE96821C230
for <gentoo-commits@lists.gentoo.org>; Sat, 15 Oct 2011 18:58:46 +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 61EAC1B4009
for <gentoo-commits@lists.gentoo.org>; Sat, 15 Oct 2011 18:58:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id A6D6D80042
for <gentoo-commits@lists.gentoo.org>; Sat, 15 Oct 2011 18:58:45 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <5e0a1972beb98d31772c8eb10ac70df5f608e2a1.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/repoman
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 5e0a1972beb98d31772c8eb10ac70df5f608e2a1
Date: Sat, 15 Oct 2011 18:58:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: f162d85d6ca1619817d518dad71f3296
commit: 5e0a1972beb98d31772c8eb10ac70df5f608e2a1
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 18:58:26 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 18:58:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D5e0a1972
repoman: handle categories for multiple masters
Also, copy repoman_settings.categories to each individual
profile's dep_settings.categories attribute, in order to ensure
that portdbapi.cp_list() uses the correct category set.
---
bin/repoman | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/bin/repoman b/bin/repoman
index b80b783..cdf1001 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -677,7 +677,7 @@ logging.info('PORTDIR_OVERLAY =3D "%s"' % env['PORTDI=
R_OVERLAY'])
env['FEATURES'] =3D env.get('FEATURES', '') + ' -unknown-features-warn'
=20
categories =3D []
-for path in set([portdir, repodir]):
+for path in repo_info.eclass_db.porttrees:
categories.extend(portage.util.grabfile(
os.path.join(path, 'profiles', 'categories')))
repoman_settings.categories =3D frozenset(
@@ -2000,6 +2000,7 @@ for x in effective_scanlist:
local_config=3DFalse,
_unmatched_removal=3Doptions.unmatched_removal,
env=3Denv, _eprefix=3Deprefix)
+ dep_settings.categories =3D repoman_settings.categories
if options.without_mask:
dep_settings._mask_manager =3D \
copy.deepcopy(dep_settings._mask_manager)