| 1 |
commit: 0ad7157bcadf54bf39f28b0157355950b4c04f59 |
| 2 |
Author: Kenneth Raplee <kenrap <AT> kennethraplee <DOT> com> |
| 3 |
AuthorDate: Mon Mar 28 00:59:30 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 28 01:10:19 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0ad7157b |
| 7 |
|
| 8 |
Revert Portage settings refactor |
| 9 |
|
| 10 |
This partially reverts 18e5a8170c69aecd10f162918de571d85055ae81. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/836298 |
| 13 |
Bug: https://bugs.gentoo.org/836299 |
| 14 |
Closes: https://bugs.gentoo.org/836297 |
| 15 |
Signed-off-by: Kenneth Raplee <kenrap <AT> kennethraplee.com> |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
lib/portage/data.py | 18 ++++++++++-------- |
| 19 |
1 file changed, 10 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/lib/portage/data.py b/lib/portage/data.py |
| 22 |
index c783d76d0..1ef8d4aef 100644 |
| 23 |
--- a/lib/portage/data.py |
| 24 |
+++ b/lib/portage/data.py |
| 25 |
@@ -332,15 +332,17 @@ def _init(settings): |
| 26 |
# from grp.getgrnam() with PyPy |
| 27 |
native_string = platform.python_implementation() == "PyPy" |
| 28 |
|
| 29 |
+ v = settings.get("PORTAGE_GRPNAME", "portage") |
| 30 |
if native_string: |
| 31 |
- grpname = settings.get("PORTAGE_GRPNAME", "portage") |
| 32 |
- grpname = portage._native_string(grpname) |
| 33 |
- globals()["_portage_grpname"] = grpname |
| 34 |
- _initialized_globals.add("_portage_grpname") |
| 35 |
- username = settings.get("PORTAGE_USERNAME", "portage") |
| 36 |
- username = portage._native_string(username) |
| 37 |
- globals()["_portage_username"] = username |
| 38 |
- _initialized_globals.add("_portage_username") |
| 39 |
+ v = portage._native_string(v) |
| 40 |
+ globals()["_portage_grpname"] = v |
| 41 |
+ _initialized_globals.add("_portage_grpname") |
| 42 |
+ |
| 43 |
+ v = settings.get("PORTAGE_USERNAME", "portage") |
| 44 |
+ if native_string: |
| 45 |
+ v = portage._native_string(v) |
| 46 |
+ globals()["_portage_username"] = v |
| 47 |
+ _initialized_globals.add("_portage_username") |
| 48 |
|
| 49 |
if "secpass" not in _initialized_globals: |
| 50 |
v = 0 |
Archives