| 1 |
commit: f99ddf5659d143dd876ab05c5ff2ce425ffde672 |
| 2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 27 19:12:53 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 30 22:28:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f99ddf56 |
| 7 |
|
| 8 |
Revert "env-update: skip PATH in systemd user environment definition" |
| 9 |
|
| 10 |
This reverts commit 21739ea1e0a793e207b7ae28d524e45582d9b2ca, as it |
| 11 |
was appearantly not necessary. Not sure what drove me into believing |
| 12 |
that this was needed… |
| 13 |
|
| 14 |
Thanks to Arsen for pointing this out. |
| 15 |
|
| 16 |
Closes: https://bugs.gentoo.org/883307 |
| 17 |
Reported-by: Arsen Arsenović <arsen <AT> aarsen.me> |
| 18 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 19 |
Closes: https://github.com/gentoo/portage/pull/949 |
| 20 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 21 |
|
| 22 |
NEWS | 3 +++ |
| 23 |
lib/portage/util/env_update.py | 5 ----- |
| 24 |
2 files changed, 3 insertions(+), 5 deletions(-) |
| 25 |
|
| 26 |
diff --git a/NEWS b/NEWS |
| 27 |
index 6fd185fcb..57d9c92ee 100644 |
| 28 |
--- a/NEWS |
| 29 |
+++ b/NEWS |
| 30 |
@@ -46,6 +46,9 @@ Bug fixes: |
| 31 |
in different ways, but one example was a rebuild in / causing the same package |
| 32 |
to be added to ROOT, even when it had no other reason to be. |
| 33 |
|
| 34 |
+* env-update: Also generate PATH definition in systemd user environment file |
| 35 |
+ /etc/environment.d/10-gentoo-env.conf |
| 36 |
+ |
| 37 |
portage-3.0.39 (2022-11-20) |
| 38 |
-------------- |
| 39 |
|
| 40 |
|
| 41 |
diff --git a/lib/portage/util/env_update.py b/lib/portage/util/env_update.py |
| 42 |
index bb0ebf84c..bac5b6e7a 100644 |
| 43 |
--- a/lib/portage/util/env_update.py |
| 44 |
+++ b/lib/portage/util/env_update.py |
| 45 |
@@ -417,11 +417,6 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, writemsg_lev |
| 46 |
systemd_gentoo_env.write(senvnotice) |
| 47 |
|
| 48 |
for env_key in env_keys: |
| 49 |
- # Skip PATH since this makes it impossible to use |
| 50 |
- # "systemctl --user import-environment PATH". |
| 51 |
- if env_key == "PATH": |
| 52 |
- continue |
| 53 |
- |
| 54 |
env_key_value = env[env_key] |
| 55 |
|
| 56 |
# Skip variables with the empty string |
Archives