commit: 0ad7157bcadf54bf39f28b0157355950b4c04f59 Author: Kenneth Raplee <kenrap <AT> kennethraplee <DOT> com> AuthorDate: Mon Mar 28 00:59:30 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 28 01:10:19 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0ad7157b
Revert Portage settings refactor This partially reverts 18e5a8170c69aecd10f162918de571d85055ae81. Bug: https://bugs.gentoo.org/836298 Bug: https://bugs.gentoo.org/836299 Closes: https://bugs.gentoo.org/836297 Signed-off-by: Kenneth Raplee <kenrap <AT> kennethraplee.com> Signed-off-by: Sam James <sam <AT> gentoo.org> lib/portage/data.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/portage/data.py b/lib/portage/data.py index c783d76d0..1ef8d4aef 100644 --- a/lib/portage/data.py +++ b/lib/portage/data.py @@ -332,15 +332,17 @@ def _init(settings): # from grp.getgrnam() with PyPy native_string = platform.python_implementation() == "PyPy" + v = settings.get("PORTAGE_GRPNAME", "portage") if native_string: - grpname = settings.get("PORTAGE_GRPNAME", "portage") - grpname = portage._native_string(grpname) - globals()["_portage_grpname"] = grpname - _initialized_globals.add("_portage_grpname") - username = settings.get("PORTAGE_USERNAME", "portage") - username = portage._native_string(username) - globals()["_portage_username"] = username - _initialized_globals.add("_portage_username") + v = portage._native_string(v) + globals()["_portage_grpname"] = v + _initialized_globals.add("_portage_grpname") + + v = settings.get("PORTAGE_USERNAME", "portage") + if native_string: + v = portage._native_string(v) + globals()["_portage_username"] = v + _initialized_globals.add("_portage_username") if "secpass" not in _initialized_globals: v = 0
