diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-06 09:18:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-06 09:18:49 +0000 |
| commit | 11077ac16f68d49d4fd08817255385f428338d7c (patch) | |
| tree | 70b8c7a9460d294cf19f2b125cf6040869580fed /pym/_emerge/emergelog.py | |
| parent | 791b1bc23bf51f5706de80d2b4ce2236e0054cf3 (diff) | |
| download | portage-11077ac16f68d49d4fd08817255385f428338d7c.tar.gz portage-11077ac16f68d49d4fd08817255385f428338d7c.tar.bz2 portage-11077ac16f68d49d4fd08817255385f428338d7c.zip | |
Add unicode conversions in various logging code.
svn path=/main/trunk/; revision=13931
Diffstat (limited to 'pym/_emerge/emergelog.py')
| -rw-r--r-- | pym/_emerge/emergelog.py | 7 |
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 |