diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-11-04 21:48:41 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-11-04 21:48:41 +0000 |
| commit | 2e1fa1684d5c311d12b7cbf67c684f51e7cea7cc (patch) | |
| tree | 36cd0edaff6b6a53645d7ece01518d0ab0142681 | |
| parent | Bug #291331 - Make send_mail() encode the unicode message as bytes before (diff) | |
| download | portage-multirepo-2e1fa1684d5c311d12b7cbf67c684f51e7cea7cc.tar.gz portage-multirepo-2e1fa1684d5c311d12b7cbf67c684f51e7cea7cc.tar.bz2 portage-multirepo-2e1fa1684d5c311d12b7cbf67c684f51e7cea7cc.zip | |
Decode git output in _emerge.actions.git_sync_timestamps() for bug #291790.
svn path=/main/trunk/; revision=14777
| -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 bd668985..7f728cef 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, \ @@ -2465,7 +2466,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 |