Attachment #193926 for bug #273099




			del f
		logid_time = time.strftime("%Y%m%d-%H%M%S",
			time.gmtime(os.stat(logid_path).st_mtime))
			
		if "split-log" in mysettings.features:
			mysettings["PORTAGE_LOG_FILE"] = os.path.join(
				mysettings["PORT_LOGDIR"], "build", "%s/%s:%s.log" % \
				(mysettings["CATEGORY"], mysettings["PF"], logid_time))
		else:
			mysettings["PORTAGE_LOG_FILE"] = os.path.join(
				mysettings["PORT_LOGDIR"], "%s:%s:%s.log" % \
				(mysettings["CATEGORY"], mysettings["PF"], logid_time))

		portage.util.ensure_dirs(os.path.dirname(mysettings["PORTAGE_LOG_FILE"]))

		del logid_path, logid_time
	else:
		# When sesandbox is enabled, only log if PORT_LOGDIR is explicitly




		elogdir = os.path.join(mysettings["PORT_LOGDIR"], "elog")
	else:
		elogdir = os.path.join(os.sep, "var", "log", "portage", "elog")
	ensure_dirs(elogdir, uid=portage_uid, gid=portage_gid, mode=02770)

	if "split-elog" in mysettings.features:
		elogfilename = elogdir+"/"+key+":"+time.strftime("%Y%m%d-%H%M%S", time.gmtime(time.time()))+".log"
	else:
		elogfilename = elogdir+"/"+path+":"+time.strftime("%Y%m%d-%H%M%S", time.gmtime(time.time()))+".log"
	ensure_dirs(os.path.dirname(elogfilename), uid=portage_uid, gid=portage_gid, mode=02770)
	
	elogfile = open(elogfilename, "w")
	elogfile.write(fulltext)
	elogfile.close()

Lines 327-332 Link Here

(-)man/make.conf.5 (+8 lines)
327	\fBFEATURES\fR in order to avoid warning messages that are triggered by this	327	\fBFEATURES\fR in order to avoid warning messages that are triggered by this
328	incompatibility.	328	incompatibility.
329	.TP	329	.TP
		330	split\-elog
		331	Store logs created by \fBPORTAGE_ELOG_SYSTEM="save"\fR in category subdirectories
		332	of \fBPORTAGE_LOGDIR/elog\fR, instead of using \fBPORTAGE_LOGDIR/elog\fR directly.
		333	.TP
		334	.B split\-log
		335	Store build logs in category subdirectories of \fBPORTAGE_LOGDIR/build\fR, instead
		336	of using \fBPORTAGE_LOGDIR\fR directly.
		337	.TP
330	.B splitdebug	338	.B splitdebug
331	Prior to stripping ELF etdyn and etexec files, the debugging info is	339	Prior to stripping ELF etdyn and etexec files, the debugging info is
332	stored for later use by various debuggers. This feature is disabled by	340	stored for later use by various debuggers. This feature is disabled by

Return to bug 273099

Lines 5691-5699 Link Here

(-)pym/portage/__init__.py (-3 / +12 lines)
5691	del f	5691	del f
5692	logid_time = time.strftime("%Y%m%d-%H%M%S",	5692	logid_time = time.strftime("%Y%m%d-%H%M%S",
5693	time.gmtime(os.stat(logid_path).st_mtime))	5693	time.gmtime(os.stat(logid_path).st_mtime))
5694	mysettings["PORTAGE_LOG_FILE"] = os.path.join(	5694
5695	mysettings["PORT_LOGDIR"], "%s:%s:%s.log" % \	5695	if "split-log" in mysettings.features:
5696	(mysettings["CATEGORY"], mysettings["PF"], logid_time))	5696	mysettings["PORTAGE_LOG_FILE"] = os.path.join(
		5697	mysettings["PORT_LOGDIR"], "build", "%s/%s:%s.log" % \
		5698	(mysettings["CATEGORY"], mysettings["PF"], logid_time))
		5699	else:
		5700	mysettings["PORTAGE_LOG_FILE"] = os.path.join(
		5701	mysettings["PORT_LOGDIR"], "%s:%s:%s.log" % \
		5702	(mysettings["CATEGORY"], mysettings["PF"], logid_time))
		5703
		5704	portage.util.ensure_dirs(os.path.dirname(mysettings["PORTAGE_LOG_FILE"]))
		5705
5697	del logid_path, logid_time	5706	del logid_path, logid_time
5698	else:	5707	else:
5699	# When sesandbox is enabled, only log if PORT_LOGDIR is explicitly	5708	# When sesandbox is enabled, only log if PORT_LOGDIR is explicitly

Lines 14-22 Link Here

(-)pym/portage/elog/mod_save.py (-2 / +6 lines)
14	elogdir = os.path.join(mysettings["PORT_LOGDIR"], "elog")	14	elogdir = os.path.join(mysettings["PORT_LOGDIR"], "elog")
15	else:	15	else:
16	elogdir = os.path.join(os.sep, "var", "log", "portage", "elog")	16	elogdir = os.path.join(os.sep, "var", "log", "portage", "elog")
17	ensure_dirs(elogdir, uid=portage_uid, gid=portage_gid, mode=02770)
18		17
19	elogfilename = elogdir+"/"+path+":"+time.strftime("%Y%m%d-%H%M%S", time.gmtime(time.time()))+".log"	18	if "split-elog" in mysettings.features:
		19	elogfilename = elogdir+"/"+key+":"+time.strftime("%Y%m%d-%H%M%S", time.gmtime(time.time()))+".log"
		20	else:
		21	elogfilename = elogdir+"/"+path+":"+time.strftime("%Y%m%d-%H%M%S", time.gmtime(time.time()))+".log"
		22	ensure_dirs(os.path.dirname(elogfilename), uid=portage_uid, gid=portage_gid, mode=02770)
		23
20	elogfile = open(elogfilename, "w")	24	elogfile = open(elogfilename, "w")
21	elogfile.write(fulltext)	25	elogfile.write(fulltext)
22	elogfile.close()	26	elogfile.close()