aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-04-01 16:38:27 (GMT)
committerZac Medico <zmedico@gentoo.org>2012-04-01 16:38:27 (GMT)
commitdbb74f7abe050252655b7b4a0c4517e747ac7c08 (patch)
tree654d43f2897555d616b39621837786064d430777
parentvarexpand: optimize access to current char (diff)
downloadportage-dbb74f7abe050252655b7b4a0c4517e747ac7c08.zip
portage-dbb74f7abe050252655b7b4a0c4517e747ac7c08.tar.gz
portage-dbb74f7abe050252655b7b4a0c4517e747ac7c08.tar.bz2
dispatch_conf: don't pass bytes for Popen cmd
This will fix bug #410417.
-rw-r--r--pym/portage/dispatch_conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index cc98fad..c81153a 100644
--- a/pym/portage/dispatch_conf.py
+++ b/pym/portage/dispatch_conf.py
@@ -30,7 +30,7 @@ def diffstatusoutput(cmd, file1, file2):
"""
# Use Popen to emulate getstatusoutput(), since getstatusoutput() may
# raise a UnicodeDecodeError which makes the output inaccessible.
- proc = subprocess.Popen(portage._unicode_encode(cmd % (file1, file2)),
+ proc = subprocess.Popen(cmd % (file1, file2),
stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
output = portage._unicode_decode(proc.communicate()[0])
if output and output[-1] == "\n":