summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'pym/_emerge/emergelog.py')
-rw-r--r--pym/_emerge/emergelog.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/pym/_emerge/emergelog.py b/pym/_emerge/emergelog.py
index 1469f5265..1a26cc9fa 100644
--- a/pym/_emerge/emergelog.py
+++ b/pym/_emerge/emergelog.py
@@ -19,6 +19,13 @@ from portage.output import xtermTitle
_emerge_log_dir = '/var/log'
def emergelog(xterm_titles, mystr, short_msg=None):
+
+ if not isinstance(mystr, unicode):
+ mystr = unicode(mystr, encoding='utf_8', errors='replace')
+
+ if short_msg is not None and not isinstance(short_msg, unicode):
+ short_msg = unicode(short_msg, encoding='utf_8', errors='replace')
+
if xterm_titles and short_msg:
if "HOSTNAME" in os.environ:
short_msg = os.environ["HOSTNAME"]+": "+short_msg