From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SENno-0007Gx-7p for garchives@archives.gentoo.org; Sun, 01 Apr 2012 16:38:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1CF8E0C85; Sun, 1 Apr 2012 16:38:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C4F77E0C85 for ; Sun, 1 Apr 2012 16:38:44 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CC151B401B for ; Sun, 1 Apr 2012 16:38:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2734FE5403 for ; Sun, 1 Apr 2012 16:38:41 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1333298307.dbb74f7abe050252655b7b4a0c4517e747ac7c08.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dispatch_conf.py X-VCS-Directories: pym/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: dbb74f7abe050252655b7b4a0c4517e747ac7c08 X-VCS-Branch: master Date: Sun, 1 Apr 2012 16:38:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: cdfb3d26-93e6-4af1-a370-a3340038066d X-Archives-Hash: 118b33e0799111c9f92d2109752c1ca2 commit: dbb74f7abe050252655b7b4a0c4517e747ac7c08 Author: Zac Medico gentoo org> AuthorDate: Sun Apr 1 16:38:27 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Apr 1 16:38:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Ddbb74f7a dispatch_conf: don't pass bytes for Popen cmd This will fix bug #410417. --- pym/portage/dispatch_conf.py | 2 +- 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() ma= y # raise a UnicodeDecodeError which makes the output inaccessible. - proc =3D subprocess.Popen(portage._unicode_encode(cmd % (file1, file= 2)), + proc =3D subprocess.Popen(cmd % (file1, file2), stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.STDOUT, shell=3DTr= ue) output =3D portage._unicode_decode(proc.communicate()[0]) if output and output[-1] =3D=3D "\n":