Attachment #198814 for bug #270040

Lines 124-129 Link Here

(-)pym/portage/dbapi/porttree.py (-1 / +5 lines)
124	"Define self.settings as an alias for self.mysettings, " + \	124	"Define self.settings as an alias for self.mysettings, " + \
125	"for conformity with other dbapi classes.")	125	"for conformity with other dbapi classes.")
126		126
		127	@property
		128	def _categories(self):
		129	return self.settings.categories
		130
127	def __init__(self, porttree_root, mysettings=None):	131	def __init__(self, porttree_root, mysettings=None):
128	portdbapi.portdbapi_instances.append(self)	132	portdbapi.portdbapi_instances.append(self)
129		133
Lines 133-139 Link Here
133	else:	137	else:
134	from portage import settings	138	from portage import settings
135	self.mysettings = config(clone=settings)	139	self.mysettings = config(clone=settings)
136	self._categories = self.mysettings.categories	140
137	# This is strictly for use in aux_get() doebuild calls when metadata	141	# This is strictly for use in aux_get() doebuild calls when metadata
138	# is generated by the depend phase. It's safest to use a clone for	142	# is generated by the depend phase. It's safest to use a clone for
139	# this purpose because doebuild makes many changes to the config	143	# this purpose because doebuild makes many changes to the config

Lines 513-518 Link Here

(-)bin/repoman (+8 lines)
513	logging.info('PORTDIR = "' + portdir + '"')	513	logging.info('PORTDIR = "' + portdir + '"')
514	logging.info('PORTDIR_OVERLAY = "%s"' % env['PORTDIR_OVERLAY'])	514	logging.info('PORTDIR_OVERLAY = "%s"' % env['PORTDIR_OVERLAY'])
515		515
		516	categories = []
		517	for path in set([portdir, portdir_overlay]):
		518	categories.extend(portage.util.grabfile(
		519	os.path.join(path, 'profiles', 'categories')))
		520	repoman_settings.categories = tuple(sorted(
		521	portage.util.stack_lists([categories], incremental=1)))
		522	del categories
		523
516	portdb.mysettings = repoman_settings	524	portdb.mysettings = repoman_settings
517	root_config = RootConfig(repoman_settings, trees[root], None)	525	root_config = RootConfig(repoman_settings, trees[root], None)
518	# We really only need to cache the metadata that's necessary for visibility	526	# We really only need to cache the metadata that's necessary for visibility

Return to bug 270040