Attachment #18920 for bug #29819

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




				if not os.path.exists(settings["DISTCC_DIR"]):
					os.makedirs(settings["DISTCC_DIR"])
					os.chown(settings["DISTCC_DIR"],portage_uid,portage_gid)
					os.chmod(settings["DISTCC_DIR"],02755)
				for x in ("/lock", "/state"):
					if not os.path.exists(settings["DISTCC_DIR"]+x):
						os.mkdir(settings["DISTCC_DIR"]+x)
						os.chown(settings["DISTCC_DIR"]+x,portage_uid,portage_gid)
						os.chmod(settings["DISTCC_DIR"]+x,02755)
			except OSError, e:
				sys.stderr.write("\n!!! File system problem when setting DISTCC_DIR directory permissions.\n")
				sys.stderr.write(  "!!! DISTCC_DIR="+str(settings["DISTCC_DIR"]+"\n"))

Return to bug 29819

Lines 1684-1695 Link Here

(-)portage.py.dist (-2 / +2 lines)
1684	if not os.path.exists(settings["DISTCC_DIR"]):	1684	if not os.path.exists(settings["DISTCC_DIR"]):
1685	os.makedirs(settings["DISTCC_DIR"])	1685	os.makedirs(settings["DISTCC_DIR"])
1686	os.chown(settings["DISTCC_DIR"],portage_uid,portage_gid)	1686	os.chown(settings["DISTCC_DIR"],portage_uid,portage_gid)
1687	os.chmod(settings["DISTCC_DIR"],0644)	1687	os.chmod(settings["DISTCC_DIR"],02755)
1688	for x in ("/lock", "/state"):	1688	for x in ("/lock", "/state"):
1689	if not os.path.exists(settings["DISTCC_DIR"]+x):	1689	if not os.path.exists(settings["DISTCC_DIR"]+x):
1690	os.mkdir(settings["DISTCC_DIR"]+x)	1690	os.mkdir(settings["DISTCC_DIR"]+x)
1691	os.chown(settings["DISTCC_DIR"]+x,portage_uid,portage_gid)	1691	os.chown(settings["DISTCC_DIR"]+x,portage_uid,portage_gid)
1692	os.chmod(settings["DISTCC_DIR"]+x,0644)	1692	os.chmod(settings["DISTCC_DIR"]+x,02755)
1693	except OSError, e:	1693	except OSError, e:
1694	sys.stderr.write("\n!!! File system problem when setting DISTCC_DIR directory permissions.\n")	1694	sys.stderr.write("\n!!! File system problem when setting DISTCC_DIR directory permissions.\n")
1695	sys.stderr.write( "!!! DISTCC_DIR="+str(settings["DISTCC_DIR"]+"\n"))	1695	sys.stderr.write( "!!! DISTCC_DIR="+str(settings["DISTCC_DIR"]+"\n"))