Attachment #95612 for bug #145530




	  MOVE_BINARY, PRELINK_BINARY, WORLD_FILE, MAKE_CONF_FILE, MAKE_DEFAULTS_FILE, \
	  DEPRECATED_PROFILE_FILE, USER_VIRTUALS_FILE, EBUILD_SH_ENV_FILE, \
	  INVALID_ENV_FILE, CUSTOM_MIRRORS_FILE, CONFIG_MEMORY_FILE,\
	  INCREMENTALS, EAPI, MISC_SH_BINARY, MAKE_CONF_DIR

	from portage_data import ostype, lchown, userland, secpass, uid, wheelgid, \
	                         portage_uid, portage_gid

					allow_sourcing=True)
				if self.mygcfg is None:
					self.mygcfg = {}

				if os.path.isdir(os.path.join(config_root, MAKE_CONF_DIR)):
					dirlist = os.listdir(os.path.join(config_root, MAKE_CONF_DIR))
					dirlist.sort()
					for f in dirlist:
						if not f.startswith(".") and f.endswith(".conf"):
							self.mygcfg = getconfig(
								os.path.join(config_root, MAKE_CONF_DIR, f),
								allow_sourcing=True,
								include_config=self.mygcfg)

			except SystemExit, e:
				raise
			except Exception, e:

Lines 32-37 Link Here

(-)portage-2.1-r2.orig/pym/portage_const.py (+1 lines)
32		32
33	WORLD_FILE = PRIVATE_PATH + "/world"	33	WORLD_FILE = PRIVATE_PATH + "/world"
34	MAKE_CONF_FILE = "/etc/make.conf"	34	MAKE_CONF_FILE = "/etc/make.conf"
		35	MAKE_CONF_DIR = "/etc/make.conf.d"
35	MAKE_DEFAULTS_FILE = PROFILE_PATH + "/make.defaults"	36	MAKE_DEFAULTS_FILE = PROFILE_PATH + "/make.defaults"
36	DEPRECATED_PROFILE_FILE = PROFILE_PATH+"/deprecated"	37	DEPRECATED_PROFILE_FILE = PROFILE_PATH+"/deprecated"
37	USER_VIRTUALS_FILE = USER_CONFIG_PATH+"/virtuals"	38	USER_VIRTUALS_FILE = USER_CONFIG_PATH+"/virtuals"

Lines 215-222 Link Here

(-)portage-2.1-r2.orig/pym/portage_util.py (-2 / +6 lines)
215	return 0	215	return 0
216	return 1	216	return 1
217		217
218	def getconfig(mycfg,tolerant=0,allow_sourcing=False):	218	def getconfig(mycfg,tolerant=0,allow_sourcing=False,include_config=None):
219	mykeys={}	219	if isinstance(include_config, dict):
		220	mykeys=include_config
		221	else:
		222	mykeys={}
		223
220	try:	224	try:
221	f=open(mycfg,'r')	225	f=open(mycfg,'r')
222	except IOError:	226	except IOError:

Return to bug 145530

Lines 72-78 Link Here

(-)portage-2.1-r2.orig/pym/portage.py (-1 / +12 lines)
72	MOVE_BINARY, PRELINK_BINARY, WORLD_FILE, MAKE_CONF_FILE, MAKE_DEFAULTS_FILE, \	72	MOVE_BINARY, PRELINK_BINARY, WORLD_FILE, MAKE_CONF_FILE, MAKE_DEFAULTS_FILE, \
73	DEPRECATED_PROFILE_FILE, USER_VIRTUALS_FILE, EBUILD_SH_ENV_FILE, \	73	DEPRECATED_PROFILE_FILE, USER_VIRTUALS_FILE, EBUILD_SH_ENV_FILE, \
74	INVALID_ENV_FILE, CUSTOM_MIRRORS_FILE, CONFIG_MEMORY_FILE,\	74	INVALID_ENV_FILE, CUSTOM_MIRRORS_FILE, CONFIG_MEMORY_FILE,\
75	INCREMENTALS, EAPI, MISC_SH_BINARY	75	INCREMENTALS, EAPI, MISC_SH_BINARY, MAKE_CONF_DIR
76		76
77	from portage_data import ostype, lchown, userland, secpass, uid, wheelgid, \	77	from portage_data import ostype, lchown, userland, secpass, uid, wheelgid, \
78	portage_uid, portage_gid	78	portage_uid, portage_gid
Lines 1125-1130 Link Here
1125	allow_sourcing=True)	1125	allow_sourcing=True)
1126	if self.mygcfg is None:	1126	if self.mygcfg is None:
1127	self.mygcfg = {}	1127	self.mygcfg = {}
		1128
		1129	if os.path.isdir(os.path.join(config_root, MAKE_CONF_DIR)):
		1130	dirlist = os.listdir(os.path.join(config_root, MAKE_CONF_DIR))
		1131	dirlist.sort()
		1132	for f in dirlist:
		1133	if not f.startswith(".") and f.endswith(".conf"):
		1134	self.mygcfg = getconfig(
		1135	os.path.join(config_root, MAKE_CONF_DIR, f),
		1136	allow_sourcing=True,
		1137	include_config=self.mygcfg)
		1138
1128	except SystemExit, e:	1139	except SystemExit, e:
1129	raise	1140	raise
1130	except Exception, e:	1141	except Exception, e: