| 1 |
Author: arfrever |
| 2 |
Date: 2009-11-04 21:48:41 +0000 (Wed, 04 Nov 2009) |
| 3 |
New Revision: 14777 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/actions.py |
| 7 |
Log: |
| 8 |
Decode git output in _emerge.actions.git_sync_timestamps() for bug #291790. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/actions.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/actions.py 2009-11-04 21:41:40 UTC (rev 14776) |
| 14 |
+++ main/trunk/pym/_emerge/actions.py 2009-11-04 21:48:41 UTC (rev 14777) |
| 15 |
@@ -24,6 +24,7 @@ |
| 16 |
import portage |
| 17 |
from portage import os |
| 18 |
from portage import digraph |
| 19 |
+from portage import _unicode_decode |
| 20 |
from portage.cache.cache_errors import CacheError |
| 21 |
from portage.const import NEWS_LIB_PATH |
| 22 |
from portage.output import blue, bold, colorize, create_color_func, darkgreen, \ |
| 23 |
@@ -2465,7 +2466,7 @@ |
| 24 |
portage._shell_quote(portdir)] |
| 25 |
import subprocess |
| 26 |
proc = subprocess.Popen(args, stdout=subprocess.PIPE) |
| 27 |
- modified_files = set(l.rstrip("\n") for l in proc.stdout) |
| 28 |
+ modified_files = set(_unicode_decode(l).rstrip("\n") for l in proc.stdout) |
| 29 |
rval = proc.wait() |
| 30 |
if rval != os.EX_OK: |
| 31 |
return rval |
Archives