Attachment #87027 for bug #133740

View | Details | Raw Unified | Return to bug 133740
Collapse All | Expand All




			else:
				abs_user_config = os.path.join(config_root,
					USER_CONFIG_PATH.lstrip(os.path.sep))
				locations = [os.path.join(self["PORTDIR"], "profiles")]
					abs_user_config]
				for ov in self["PORTDIR_OVERLAY"].split():
					ov = os.path.normpath(ov)
					if os.path.isdir(ov+"/profiles"):
						locations.append(ov+"/profiles")
				locations.append(abs_user_config)

			if os.environ.get("PORTAGE_CALLER","") == "repoman":
				self.pusedict = {}

	# XXX- This is a temporary duplicate of code from the config constructor.
	locations = settings.profiles[:]
	locations.append(os.path.join(settings["PORTDIR"], "profiles"))
	locations.append(os.path.join(settings["PORTAGE_CONFIGROOT"],
		USER_CONFIG_PATH.lstrip(os.path.sep)))
	for ov in settings["PORTDIR_OVERLAY"].split():
		profdir = os.path.join(os.path.normpath(ov), "profiles")
		if os.path.isdir(profdir):
			locations.append(profdir)
	locations.append(os.path.join(settings["PORTAGE_CONFIGROOT"],
		USER_CONFIG_PATH.lstrip(os.path.sep)))
	locations.reverse()
	pmasklists = [grablines(os.path.join(x, "package.mask"), recursive=1) for x in locations]
	pmasklines = []

Return to bug 133740

Lines 1137-1148 class config: Link Here

(-)portage.py (-4 / +4 lines)
1137	else:	1137	else:
1138	abs_user_config = os.path.join(config_root,	1138	abs_user_config = os.path.join(config_root,
1139	USER_CONFIG_PATH.lstrip(os.path.sep))	1139	USER_CONFIG_PATH.lstrip(os.path.sep))
1140	locations = [os.path.join(self["PORTDIR"], "profiles"),	1140	locations = [os.path.join(self["PORTDIR"], "profiles")]
1141	abs_user_config]
1142	for ov in self["PORTDIR_OVERLAY"].split():	1141	for ov in self["PORTDIR_OVERLAY"].split():
1143	ov = os.path.normpath(ov)	1142	ov = os.path.normpath(ov)
1144	if os.path.isdir(ov+"/profiles"):	1143	if os.path.isdir(ov+"/profiles"):
1145	locations.append(ov+"/profiles")	1144	locations.append(ov+"/profiles")
		1145	locations.append(abs_user_config)
1146		1146
1147	if os.environ.get("PORTAGE_CALLER","") == "repoman":	1147	if os.environ.get("PORTAGE_CALLER","") == "repoman":
1148	self.pusedict = {}	1148	self.pusedict = {}
Lines 3571-3582 def getmaskingreason(mycpv): Link Here
3571	# XXX- This is a temporary duplicate of code from the config constructor.	3571	# XXX- This is a temporary duplicate of code from the config constructor.
3572	locations = settings.profiles[:]	3572	locations = settings.profiles[:]
3573	locations.append(os.path.join(settings["PORTDIR"], "profiles"))	3573	locations.append(os.path.join(settings["PORTDIR"], "profiles"))
3574	locations.append(os.path.join(settings["PORTAGE_CONFIGROOT"],
3575	USER_CONFIG_PATH.lstrip(os.path.sep)))
3576	for ov in settings["PORTDIR_OVERLAY"].split():	3574	for ov in settings["PORTDIR_OVERLAY"].split():
3577	profdir = os.path.join(os.path.normpath(ov), "profiles")	3575	profdir = os.path.join(os.path.normpath(ov), "profiles")
3578	if os.path.isdir(profdir):	3576	if os.path.isdir(profdir):
3579	locations.append(profdir)	3577	locations.append(profdir)
		3578	locations.append(os.path.join(settings["PORTAGE_CONFIGROOT"],
		3579	USER_CONFIG_PATH.lstrip(os.path.sep)))
3580	locations.reverse()	3580	locations.reverse()
3581	pmasklists = [grablines(os.path.join(x, "package.mask"), recursive=1) for x in locations]	3581	pmasklists = [grablines(os.path.join(x, "package.mask"), recursive=1) for x in locations]
3582	pmasklines = []	3582	pmasklines = []