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 5b554a7bf240de1eaa677f397f587dec71565338..2e870fe5deb58b441226ac8f0f8fc80f9a57530a 100644 (file)
--- 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 f5623cea957e975ee4a2ff74d214344a6b2bb2fe..eeb8fa0dacbd40d79c470f27893792832e947187 100644 (file)
--- 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()