[patch] fix popen UnicodeDecode error

dispatch-conf-fix-popen-UnicodeDecode-error.patch (text/plain), 1.69 KB, created by Zac Medico on 2016-03-09 06:54:30 UTC

From faa37e00af1528a0f8649de26db8f22853c18b32 Mon Sep 17 00:00:00 2001
From: Zac Medico <[e-mail]>
Date: Tue, 8 Mar 2016 22:46:24 -0800
Subject: [PATCH] dispatch-conf: fix popen UnicodeDecode error

X-Gentoo-Bug:     576788
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=576788
---
 bin/dispatch-conf | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 678a66d..fdf564e 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -1,5 +1,5 @@
 #!/usr/bin/python -bO
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 #
@@ -16,6 +16,7 @@ from __future__ import print_function, unicode_literals
 import atexit
 import io
 import re
+import subprocess
 import sys
 
 from stat import ST_GID, ST_MODE, ST_UID
@@ -137,9 +138,15 @@ class dispatch:
                 path, basename = os.path.split(path)
                 find_opts = "-maxdepth 1"
 
-            with os.popen(FIND_EXTANT_CONFIGS %
-                (path, find_opts, basename)) as proc:
-                confs += self.massage(proc.readlines())
+            try:
+                path_list = _unicode_decode(subprocess.check_output(
+                    portage.util.shlex_split(FIND_EXTANT_CONFIGS %
+                    (path, find_opts, basename))),
+                    errors='strict').splitlines()
+            except subprocess.CalledProcessError:
+                pass
+            else:
+                confs.extend(self.massage(path_list))
 
         if self.options['use-rcs'] == 'yes':
             for rcs_util in ("rcs", "ci", "co", "rcsmerge"):
-- 
2.4.10