From 9ca46474139b131a2c2e416880f65ae9e3f99fc5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 9 Oct 2009 22:50:56 +0000 Subject: Bug #273099 - Add split-log and split-elog FEATURES for splitting build logs and elog mod_save logs into category subdirectories. Thanks to Sebastian Mingramm (few) for this patch. svn path=/main/trunk/; revision=14532 --- pym/portage/elog/mod_save.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'pym/portage/elog') diff --git a/pym/portage/elog/mod_save.py b/pym/portage/elog/mod_save.py index 954787994..b1c38061d 100644 --- a/pym/portage/elog/mod_save.py +++ b/pym/portage/elog/mod_save.py @@ -21,9 +21,20 @@ def process(mysettings, key, logentries, fulltext): elogdir = os.path.join(os.sep, "var", "log", "portage", "elog") ensure_dirs(elogdir, uid=portage_uid, gid=portage_gid, mode=0o2770) - elogfilename = os.path.join(elogdir, path + ":" + _unicode_decode( + cat = mysettings['CATEGORY'] + pf = mysettings['PF'] + + elogfilename = pf + ":" + _unicode_decode( time.strftime("%Y%m%d-%H%M%S", time.gmtime(time.time())), - encoding=_encodings['content'], errors='replace') + ".log") + encoding=_encodings['content'], errors='replace') + ".log" + + if "split-elog" in mysettings.features: + elogfilename = os.path.join(elogdir, cat, elogfilename) + else: + elogfilename = os.path.join(elogdir, cat + ':' + elogfilename) + ensure_dirs(os.path.dirname(elogfilename), + uid=portage_uid, gid=portage_gid, mode=0o2770) + elogfile = codecs.open(_unicode_encode(elogfilename, encoding=_encodings['fs'], errors='strict'), mode='w', encoding=_encodings['content'], errors='backslashreplace') -- cgit v1.2.3-1-g7c22