| 1 |
commit: dbb74f7abe050252655b7b4a0c4517e747ac7c08 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 1 16:38:27 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 1 16:38:27 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=dbb74f7a |
| 7 |
|
| 8 |
dispatch_conf: don't pass bytes for Popen cmd |
| 9 |
|
| 10 |
This will fix bug #410417. |
| 11 |
|
| 12 |
--- |
| 13 |
pym/portage/dispatch_conf.py | 2 +- |
| 14 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py |
| 17 |
index cc98fad..c81153a 100644 |
| 18 |
--- a/pym/portage/dispatch_conf.py |
| 19 |
+++ b/pym/portage/dispatch_conf.py |
| 20 |
@@ -30,7 +30,7 @@ def diffstatusoutput(cmd, file1, file2): |
| 21 |
""" |
| 22 |
# Use Popen to emulate getstatusoutput(), since getstatusoutput() may |
| 23 |
# raise a UnicodeDecodeError which makes the output inaccessible. |
| 24 |
- proc = subprocess.Popen(portage._unicode_encode(cmd % (file1, file2)), |
| 25 |
+ proc = subprocess.Popen(cmd % (file1, file2), |
| 26 |
stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True) |
| 27 |
output = portage._unicode_decode(proc.communicate()[0]) |
| 28 |
if output and output[-1] == "\n": |
Archives