From: Fabian Groffen Date: Tue, 5 Feb 2008 18:01:06 +0000 (-0000) Subject: Merged from trunk 9272:9273 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b3ab931d15b7e860d3941a8e3a20f2636b892aab;p=portage.git Merged from trunk 9272:9273 | 9273 | Use local time for elog summaries | | genone | | svn path=/main/branches/prefix/; revision=9274 --- diff --git a/pym/portage/elog/mod_mail_summary.py b/pym/portage/elog/mod_mail_summary.py index 5b554a7bf..2e870fe5d 100644 --- a/pym/portage/elog/mod_mail_summary.py +++ b/pym/portage/elog/mod_mail_summary.py @@ -12,7 +12,7 @@ _items = {} def process(mysettings, key, logentries, fulltext): global _items header = ">>> Messages generated for package %s by process %d on %s:\n\n" % \ - (key, os.getpid(), time.strftime("%Y%m%d-%H%M%S", time.gmtime(time.time()))) + (key, os.getpid(), time.strftime("%Y%m%d-%H%M%S %Z", time.localtime(time.time()))) config_root = mysettings["PORTAGE_CONFIGROOT"] mysettings, items = _items.setdefault(config_root, (mysettings, {})) items[key] = header + fulltext diff --git a/pym/portage/elog/mod_save_summary.py b/pym/portage/elog/mod_save_summary.py index f5623cea9..eeb8fa0da 100644 --- a/pym/portage/elog/mod_save_summary.py +++ b/pym/portage/elog/mod_save_summary.py @@ -20,7 +20,7 @@ def process(mysettings, key, logentries, fulltext): elogfile = open(elogfilename, "a") apply_permissions(elogfilename, mode=060, mask=0) elogfile.write(">>> Messages generated by process %d on %s for package %s:\n\n" % \ - (os.getpid(), time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(time.time())), key)) + (os.getpid(), time.strftime("%Y-%m-%d %H:%M:%S %Z", time.localtime(time.time())), key)) elogfile.write(fulltext) elogfile.write("\n") elogfile.close()