diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-11-07 01:10:25 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-11-07 01:10:25 +0000 |
commit | 82e5cb0a3ad9919d61ed2962d1a5ebc7dc215671 (patch) | |
tree | ad356c3870597b77b5af055397258377f630a52c | |
parent | f329f7494d17dd5e53ea50a71cc9239c3f054ed7 (diff) | |
download | portage-82e5cb0a3ad9919d61ed2962d1a5ebc7dc215671.tar.gz portage-82e5cb0a3ad9919d61ed2962d1a5ebc7dc215671.tar.bz2 portage-82e5cb0a3ad9919d61ed2962d1a5ebc7dc215671.zip |
Decode git output in _emerge.actions.git_sync_timestamps() for bug #291790.
(trunk r14777)
svn path=/main/branches/2.1.7/; revision=14790
-rw-r--r-- | pym/_emerge/actions.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 5b6e0c44c..ac4cf999e 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -24,6 +24,7 @@ from itertools import chain import portage from portage import os from portage import digraph +from portage import _unicode_decode from portage.cache.cache_errors import CacheError from portage.const import NEWS_LIB_PATH from portage.output import blue, bold, colorize, create_color_func, darkgreen, \ @@ -2289,7 +2290,7 @@ def git_sync_timestamps(settings, portdir): portage._shell_quote(portdir)] import subprocess proc = subprocess.Popen(args, stdout=subprocess.PIPE) - modified_files = set(l.rstrip("\n") for l in proc.stdout) + modified_files = set(_unicode_decode(l).rstrip("\n") for l in proc.stdout) rval = proc.wait() if rval != os.EX_OK: return rval |