Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 40302
Collapse All | Expand All

(-)pym/portage.py.org (-1 / +7 lines)
Lines 1241-1247 Link Here
1241
			self.configlist.append(self.mygcfg)
1242
			self.configlist.append(self.mygcfg)
1242
			self.configdict["defaults"]=self.configlist[-1]
1243
			self.configdict["defaults"]=self.configlist[-1]
1243
1244
1244
			self.mygcfg=getconfig("/etc/make.conf")
1245
			if os.environ.has_key("PORTAGE_CONFIGFILE"):
1246
				self.mygcfg=getconfig(os.environ["PORTAGE_CONFIGFILE"])
1247
			elif os.environ.has_key("ROOT") and os.environ["ROOT"] != "/" \
1248
					and os.path.exists(os.environ["ROOT"])+"/etc/make.conf":
1249
				self.mygcfg=getconfig(os.environ["ROOT"]+"/etc/make.conf")
1250
			else:
1251
				self.mygcfg=getconfig("/etc/make.conf")
1245
			if self.mygcfg==None:
1252
			if self.mygcfg==None:
1246
				writemsg("!!! Parse error in /etc/make.conf.\n")
1253
				writemsg("!!! Parse error in /etc/make.conf.\n")
1247
				writemsg("!!! Incorrect multiline literals can cause this. Do not use them.\n")
1254
				writemsg("!!! Incorrect multiline literals can cause this. Do not use them.\n")

Return to bug 40302