From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 15 Oct 2011 18:58:26 +0000 (-0700)
Subject: repoman: handle categories for multiple masters
X-Git-Tag: v2.2.0_alpha68~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e0a1972beb98d31772c8eb10ac70df5f608e2a1;p=portage.git

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.
---

diff --git a/bin/repoman b/bin/repoman
index b80b78386..cdf1001bc 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -677,7 +677,7 @@ logging.info('PORTDIR_OVERLAY = "%s"' % env['PORTDIR_OVERLAY'])
 env['FEATURES'] = env.get('FEATURES', '') + ' -unknown-features-warn'
 
 categories = []
-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 = frozenset(
@@ -2000,6 +2000,7 @@ for x in effective_scanlist:
 						local_config=False,
 						_unmatched_removal=options.unmatched_removal,
 						env=env, _eprefix=eprefix)
+					dep_settings.categories = repoman_settings.categories
 					if options.without_mask:
 						dep_settings._mask_manager = \
 							copy.deepcopy(dep_settings._mask_manager)