[gentoo-commits] portage r14180 - main/trunk/pym/portage/elog

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-09-03 01:06:52 +0000 (Thu, 03 Sep 2009)
New Revision: 14180

Modified:
   main/trunk/pym/portage/elog/mod_save_summary.py
Log:
Use _unicode_decode() on the string retunred from time.strftime(), in order
to avoid a potential UnicodeDecodeError later. Thanks to Markus Duft
<mduft@g.o> for reporting.


Modified: main/trunk/pym/portage/elog/mod_save_summary.py
===================================================================
--- main/trunk/pym/portage/elog/mod_save_summary.py	2009-09-02 18:36:46 UTC (rev 14179)
+++ main/trunk/pym/portage/elog/mod_save_summary.py	2009-09-03 01:06:52 UTC (rev 14180)
@@ -7,6 +7,7 @@
 import time
 from portage import os
 from portage import _encodings
+from portage import _unicode_decode
 from portage import _unicode_encode
 from portage.data import portage_uid, portage_gid
 from portage.localization import _
@@ -25,8 +26,13 @@
 		encoding=_encodings['fs'], errors='strict'),
 		mode='a', encoding=_encodings['content'], errors='backslashreplace')
 	apply_permissions(elogfilename, mode=060, mask=0)
+	time_str = time.strftime("%Y-%m-%d %H:%M:%S %Z",
+		time.localtime(time.time()))
+	# Avoid potential UnicodeDecodeError later.
+	time_str = _unicode_decode(time_str,
+		encoding=_encodings['content'], errors='replace')
 	elogfile.write(_(">>> Messages generated by process %(pid)d on %(time)s for package %(pkg)s:\n\n") %
-			{"pid": os.getpid(), "time": time.strftime("%Y-%m-%d %H:%M:%S %Z", time.localtime(time.time())), "pkg": key})
+			{"pid": os.getpid(), "time": time_str, "pkg": key})
 	elogfile.write(fulltext)
 	elogfile.write("\n")
 	elogfile.close()