From 998cd2d755497129b72ec1ce73defb4618a2e8a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Thu, 7 Nov 2019 23:12:31 +0100 Subject: [PATCH] [entropy.spm] adapt to qfile from portage-utils-0.81 [Not tagged so in their git repository... whatever.] With -R / it prints bogus lines making Entropy crash: File "/usr/lib64/python2.7/site-packages/portage/dbapi/vartree.py", line 748, in aux_get raise KeyError(mycpv) KeyError: 'plib_registry:' The change was done in portage-utils, commit f05c78008b1754a79e31e793a67d07ed8f5d11bc Make qfile also check the prune lib registry and the problem with qfile was reported to Gentoo in bug 699558. It will break with older qfile but Entropy should fallback to slower, non-qfile code branch. --- lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py b/lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py index b0f65f0fc..db1b3d0c5 100644 --- a/lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py +++ b/lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py @@ -2084,7 +2084,7 @@ class PortagePlugin(SpmPlugin): qfile_exec = "/usr/bin/qfile" if os.path.lexists(qfile_exec): - qfile_args = (qfile_exec, "-q", "-C", "-R", root,) + qfile_args = (qfile_exec, "-q", "-C", "--skip-plibreg", "-R", root,) if exact_match: qfile_args += ("-v",)