From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 1 Apr 2012 16:38:27 +0000 (-0700)
Subject: dispatch_conf: don't pass bytes for Popen cmd
X-Git-Tag: v2.2.0_alpha98~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dbb74f7abe050252655b7b4a0c4517e747ac7c08;p=portage.git

dispatch_conf: don't pass bytes for Popen cmd

This will fix bug #410417.
---

diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index cc98fad16..c81153ae1 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":