From 7fc5bd33805830172327513fc6c73dcdc12edde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Fri, 8 Nov 2019 01:19:01 +0100 Subject: [PATCH] [entropy.spm] fix search_paths_owners (qfile) with Python 3 --- .../spm/plugins/interfaces/portage_plugin/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py b/lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py index db1b3d0c5..83dca0b6e 100644 --- a/lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py +++ b/lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py @@ -2100,14 +2100,17 @@ class PortagePlugin(SpmPlugin): matches.clear() break - pkgs = set([x.strip() for x in proc.stdout.readlines()]) + out = proc.stdout.read() + if const_is_python3(): + out = const_convert_to_unicode(out) + + proc.stdout.close() + pkgs = set([x.strip() for x in out.splitlines()]) for pkg in pkgs: slot = self.get_installed_package_metadata(pkg, "SLOT") obj = matches.setdefault((pkg, slot,), set()) obj.add(filename) - proc.stdout.close() - if rc == 0: return matches