[patch] Introduce FEATURES split-log and split-elog to use a category directory for logs instead of putting them all in one directory

portage-emerge-features-split-log-and-split-elog.patch (text/plain), 2.73 KB, created by Sebastian Luther (few) on 2009-06-08 20:32:10 UTC

Index: pym/portage/__init__.py
===================================================================
--- pym/portage/__init__.py	(revision 13635)
+++ pym/portage/__init__.py	(working copy)
@@ -5691,9 +5691,18 @@
 			del f
 		logid_time = time.strftime("%Y%m%d-%H%M%S",
 			time.gmtime(os.stat(logid_path).st_mtime))
-		mysettings["PORTAGE_LOG_FILE"] = os.path.join(
-			mysettings["PORT_LOGDIR"], "%s:%s:%s.log" % \
-			(mysettings["CATEGORY"], mysettings["PF"], logid_time))
+			
+		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
Index: pym/portage/elog/mod_save.py
===================================================================
--- pym/portage/elog/mod_save.py	(revision 13635)
+++ pym/portage/elog/mod_save.py	(working copy)
@@ -14,9 +14,13 @@
 		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)
 
-	elogfilename = elogdir+"/"+path+":"+time.strftime("%Y%m%d-%H%M%S", time.gmtime(time.time()))+".log"
+	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()
Index: man/make.conf.5
===================================================================
--- man/make.conf.5	(revision 13635)
+++ man/make.conf.5	(working copy)
@@ -327,6 +327,14 @@
 \fBFEATURES\fR in order to avoid warning messages that are triggered by this
 incompatibility.
 .TP
+split\-elog
+Store logs created by \fBPORTAGE_ELOG_SYSTEM="save"\fR in category subdirectories 
+of \fBPORTAGE_LOGDIR/elog\fR, instead of using \fBPORTAGE_LOGDIR/elog\fR directly.
+.TP 
+.B split\-log
+Store build logs in category subdirectories of \fBPORTAGE_LOGDIR/build\fR, instead
+of using \fBPORTAGE_LOGDIR\fR directly.
+.TP
 .B splitdebug
 Prior to stripping ELF etdyn and etexec files, the debugging info is 
 stored for later use by various debuggers.  This feature is disabled by