1 |
Use _unicode_decode to safely decode bytes returned from time.strftime |
2 |
for python-2.x (_unicode_decode allows unicode to pass through for |
3 |
python-3.x). |
4 |
|
5 |
X-Gentoo-Bug: 530982 |
6 |
X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=530982 |
7 |
--- |
8 |
pym/_emerge/sync/old_tree_timestamp.py | 5 +++-- |
9 |
1 file changed, 3 insertions(+), 2 deletions(-) |
10 |
|
11 |
diff --git a/pym/_emerge/sync/old_tree_timestamp.py b/pym/_emerge/sync/old_tree_timestamp.py |
12 |
index aa23a27..aaed18b 100644 |
13 |
--- a/pym/_emerge/sync/old_tree_timestamp.py |
14 |
+++ b/pym/_emerge/sync/old_tree_timestamp.py |
15 |
@@ -7,7 +7,7 @@ import locale |
16 |
import logging |
17 |
import time |
18 |
|
19 |
-from portage import os |
20 |
+from portage import os, _unicode_decode |
21 |
from portage.exception import PortageException |
22 |
from portage.localization import _ |
23 |
from portage.output import EOutput |
24 |
@@ -95,6 +95,7 @@ def old_tree_timestamp_warn(portdir, settings): |
25 |
whenago(unixtime - lastsync)) |
26 |
else: |
27 |
out.ewarn(_("Last emerge --sync was %s.") % \ |
28 |
- time.strftime('%c', time.localtime(lastsync))) |
29 |
+ _unicode_decode(time.strftime( |
30 |
+ '%c', time.localtime(lastsync)))) |
31 |
return True |
32 |
return False |
33 |
-- |
34 |
2.0.4 |